Merge remote branch 'gh/master' into wip-op-data-mux

diff --cc src/ceph_mds.cc
Simple merge

diff --cc src/include/ceph_fs.h
Simple merge

diff --cc src/msg/SimpleMessenger.h
Simple merge

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

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

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

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

diff --cc src/osd/osd_types.h
Simple merge

diff --cc src/rgw/rgw_rados.cc
Simple merge