Merge PR #68513 into tentacle

* refs/pull/68513/head:
	mgr/dashboard: Option to select archive option while Import Multi-site Token

Reviewed-by: Afreen Misbah <afreen@ibm.com>

diff --cc src/pybind/mgr/dashboard/controllers/rgw.py
Simple merge

diff --cc src/pybind/mgr/dashboard/openapi.yaml
index b6b3fc315e687467f72069445f9626c92c8c8f78,7fa760e6d6382a035a517bedbba9f84c0650f9b6..fb78cd23df34b047dc0522fd6362c5f4f2055e33
mode 100644,100755..100644
--- 1/src/pybind/mgr/dashboard/openapi.yaml
--- 2/src/pybind/mgr/dashboard/openapi.yaml
+++ b/src/pybind/mgr/dashboard/openapi.yaml

diff --cc src/pybind/mgr/dashboard/services/rgw_client.py
Simple merge