Merge pull request #1804 from ceph/wip-8104

Wip 8104

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

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

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

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

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

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