Merge remote-tracking branch 'gh/next'

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

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

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

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