Merge remote-tracking branch 'gh/wip-mon-refactor'

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>

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

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

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

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

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

diff --cc src/test/encoding/types.h
Simple merge