Merge remote-tracking branch 'gh/next'

diff --cc src/ceph.in
Simple merge

diff --cc src/osdc/Objecter.cc
Simple merge

diff --cc src/pybind/ceph_argparse.py
Simple merge

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