Merge PR #43510 into master

* refs/pull/43510/head:
	qa/suites/orch/cephadm/upgrade: smoke test for 'orch upgrade ls'
	mgr/cephadm: make upgrade ls output structured
	mgr/cephadm: add 'orch upgrade ls' to list available versions

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>

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

diff --cc src/pybind/mgr/cephadm/upgrade.py
Simple merge

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

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