Merge remote-tracking branch 'gh/infernalis'

diff --cc src/CMakeLists.txt
Simple merge

diff --cc src/Makefile.am
Simple merge

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

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

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

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

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