Merge remote-tracking branch 'gh/giant'

Conflicts:
	qa/workunits/cephtool/test.sh
	src/test/erasure-code/TestErasureCodeIsa.cc

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

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

diff --cc src/msg/Pipe.cc
Simple merge

diff --cc src/msg/Pipe.h
Simple merge

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

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