Merge remote branch 'origin/testing' into unstable

diff --cc src/config.cc
Simple merge

diff --cc src/config.h
Simple merge

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

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

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

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

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

diff --cc src/mon/OSDMonitor.h
Simple merge