Merge pull request #16160 from xiexingguo/wip-misc2

mon, osd: misc fixes and cleanups

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

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

diff --cc src/mon/Monitor.h
Simple merge

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

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

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