Merge PR #26898 into nautilus

* refs/pull/26898/head:
	osd/PG: invalidate PG if merging with unexpected version
	osd,mon: include more pg merge metadata in pg_pool_t
	qa/standalone/osd/pg-split-merge.sh: reproduce pg merge problem with empty pgs
	osd: add osd_debug_no_{acting_change,purge_strays}

Reviewed-by: Neha Ojha <nojha@redhat.com>

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

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

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/osd_types.h
Simple merge