Merge remote-tracking branch 'gh/next'

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

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

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

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

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

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

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

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

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

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

diff --cc src/rgw/rgw_rados.h
Simple merge