Merge branch 'next'

diff --cc configure.ac
Simple merge

diff --cc doc/release-notes.rst
Simple merge

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

diff --cc src/mon/OSDMonitor.cc
Simple merge

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

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

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