Merge remote-tracking branch 'upstream/wip-11493'

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc qa/workunits/cephtool/test.sh
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge