Merge remote-tracking branch 'ceph/jewel'

diff --cc ceph.spec.in
Simple merge

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

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

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

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