Merge branch 'unstable' into rootsnap

diff --cc src/mds/CDentry.h
Simple merge

diff --cc src/mds/CInode.cc
Simple merge

diff --cc src/mds/CInode.h
Simple merge

diff --cc src/mds/MDCache.cc
Simple merge

diff --cc src/mds/Server.cc
Simple merge