Merge pull request #1735 from ceph/wip-8113

Reviewed-by: Samuel Just <sam.just@inktank.com>

diff --cc src/common/config_opts.h
Simple merge

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

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

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

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