Merge pull request #239 from ceph/wip-4760

#4760

Second patch Reviewed-by: Sage Weil <sage@inktank.com>

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

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

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

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

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