Merge remote-tracking branch 'gh/hammer'

Conflicts:
	src/gmock

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

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

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

diff --cc src/pybind/ceph_argparse.py
Simple merge