Merge pull request #15858 from liewegas/wip-mgr-servicemap

mgr,librados: service map

Reviewed-by: John Spray <john.spray@redhat.com>

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

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

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

diff --cc src/vstart.sh
Simple merge