Merge pull request #5692 from ceph/wip-rgw-swift-expiration

Wip rgw swift expiration

Reviewed-by:  Radoslaw Zarzynski <rzarzynski@mirantis.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

diff --cc src/cls/Makefile-client.am
Simple merge

diff --cc src/cls/Makefile-server.am
Simple merge

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

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

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

diff --cc src/test/CMakeLists.txt
Simple merge

diff --cc src/test/Makefile-client.am
Simple merge

diff --cc src/test/cli/radosgw-admin/help.t
Simple merge