Merge remote-tracking branch 'gh/next'

diff --cc ceph.spec.in
Simple merge

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

diff --cc src/mon/MonCommands.h
Simple merge

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

diff --cc src/rgw/rgw_main.cc
Simple merge

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

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