Better instrument ceph
Minor fixes
Merge remote-tracking branch 'origin/feature-blkin-new' into feature-blkin

Conflicts:
	src/messages/MOSDOpReply.h
	src/messages/MOSDSubOpReply.h
	src/msg/Message.cc
	src/msg/Message.h
	src/msg/Pipe.cc
	src/osd/ReplicatedPG.cc
Instrument librados with the new changes correctly