Merge pull request #4473 from ceph/wip-10809-11135-10290

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>

diff --cc src/os/FileJournal.cc
Simple merge

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

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

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