Merge remote branch 'origin/mds_rename'

diff --cc src/client/Client.cc
Simple merge

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

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

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

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