Merge pull request #1791 from ceph/wip-8011

ReplicatedPG: block scrub on blocked object contexts

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

diff --cc src/osd/PG.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

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