Merge remote-tracking branch 'gh/hammer'

Conflicts:
	src/gmock
	src/msg/xio/XioPortal.h

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

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

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

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

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

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

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

diff --cc src/osd/OSD.h
Simple merge

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