Merge pull request #47220 from ceph/16210

v16.2.10

diff --cc qa/tasks/cephfs/test_volumes.py
Simple merge

diff --cc src/pybind/mgr/volumes/fs/operations/versions/metadata_manager.py
Simple merge

diff --cc src/pybind/mgr/volumes/fs/operations/versions/subvolume_base.py
Simple merge

diff --cc src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py
Simple merge

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