Merge PR #40735 into master

* refs/pull/40735/head:
	mgr/orchestractor: rgw realm and zone flags must both be provided

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>

diff --cc src/pybind/mgr/orchestrator/module.py
Simple merge

diff --cc src/python-common/ceph/deployment/service_spec.py
Simple merge