Merge remote-tracking branch 'gh/wip-multimds-fixes'

Reviewed-by: Sage Weil <sage@inktank.com>

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

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

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

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

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

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

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

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