Merge PR #31828 into master

* refs/pull/31828/head:
	mgr/orchestrator: include container_image in 'service ls' output
	ceph-daemon: include container_image_name and container_image_id in 'ls' output
	common/options: default to ceph/ceph:latest-master-devel (for now)

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>

diff --cc src/ceph-daemon/ceph-daemon
Simple merge

diff --cc src/common/options.cc
Simple merge

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

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

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