Merge branch 'infernalis'

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

diff --cc src/mds/MDSDaemon.cc
Simple merge

diff --cc src/mds/Server.cc
Simple merge

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

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