Merge remote-tracking branch 'origin/next'

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

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

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

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

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

diff --cc src/test/cli/osdmaptool/create-racks.t
Simple merge