Merge pull request #20419 from tchaikov/wip-22748

common/config: add units to options

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

diff --cc src/common/config.cc
Simple merge

diff --cc src/common/options.cc
Simple merge

diff --cc src/librbd/ImageCtx.cc
Simple merge

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

diff --cc src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc
Simple merge