Merge remote-tracking branch 'gh/next'

diff --cc configure.ac
Simple merge

diff --cc qa/workunits/cephtool/test.sh
Simple merge

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

diff --cc src/mon/MDSMonitor.cc
Simple merge

diff --cc src/tools/cephfs/Dumper.cc
Simple merge