Merge pull request #25142 from ivancich/wip-rgw-reshard-cleanup

rgw: reshard clean-up and associated commits

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>

diff --cc src/cls/rgw/cls_rgw_client.cc
Simple merge

diff --cc src/cls/rgw/cls_rgw_client.h
Simple merge

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

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

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

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

diff --cc src/test/cls_rgw/test_cls_rgw.cc
Simple merge