Merge pull request #13621 from Jing-Scott/add-remov-x-delete-feature

rgw: add the remove-x-delete feature to cancel swift object expiration

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

diff --cc src/rgw/rgw_file.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_rados.cc
Simple merge

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