Merge remote branch 'origin/next'

diff --cc src/client/Client.cc
Simple merge

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

diff --cc src/include/rados/librados.h
Simple merge

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

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