Merge branch 'wip-danny-perf-checks'

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

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/ReplicatedPG.cc
Simple merge