Merge remote-tracking branch 'gh/hammer'

Conflicts:
	src/gmock

diff --cc doc/man/8/rbd.rst
Simple merge

diff --cc qa/workunits/cephtool/test.sh
Simple merge

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

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

diff --cc src/osdc/Objecter.cc
Simple merge

diff --cc src/rgw/rgw_main.cc
Simple merge

diff --cc src/test/Makefile.am
Simple merge

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

diff --cc src/tools/crushtool.cc
Simple merge