Merge remote-tracking branch 'gh/wip-misc-fixes'

Conflicts:
	src/mon/Monitor.cc

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Loic Dachary <loic@dachary.org>