Merge remote-tracking branch 'private/wip-rgw-max-keys' into wip-mimic-4

diff --cc src/common/options.cc
Simple merge

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

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

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

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