Merge PR #40242 into master

* refs/pull/40242/head:
	mgr/cephadm/upgrade: do not repeat crash message
	mgr/cephadm/upgrade: a little less verbose
	mgr/cephadm: don't log not-ok-to-stop at ERR level
	mgr/cephadm: is presumed -> appears
	mgr/cephadm: don't double-log ok-to-stop results
	mgr/cephadm/upgrade: include upgrade progress in ceph -s

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

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