Merge pull request #5200 from SUSE/wip-12289-firefly

mon: scrub error (osdmap encoding mismatch?) upgrading from 0.80 to ~0.80.2

Reviewed-by: Kefu Chai <kchai@redhat.com>

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

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

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

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

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