Merge PR #32657 into master

* refs/pull/32657/head:
	test: query using mds id, not rank
	mgr: re-enable mds `scrub status` info in ceph status
	mon: filter out ceph normal ceph entity types when dumping service metadata
	mgr: filter out normal ceph services when processing service map
	mgr: helper function to check if a service is a normal ceph service

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

diff --cc src/mon/Monitor.cc
Simple merge