Daily merge of 22.0 into master, Sept 19

Done using git merge --strategy-option ours upstream/22.0

Conflicts w/o strategy-option:

both modified: AtlasTest/CITest/test/RecoRun3MC.sh

both modified: Projects/Athena/version.txt

both modified: Projects/DetCommon/version.txt

both added: Tools/PROCTools/data/q446_AOD_digest.ref

both modified: Tools/WorkflowTestRunner/python/References.py

AtlasTest/CITest/test/RecoRun3MC.sh

@@ -5,4 +5,4 @@
 # Once ATLASDQ-879 is fixed, this script can be deleted and the test defintion
 # (without the --preExec) moved to Athena.cmake.
 
-RunWorkflowTests_Run3.py --CI -r -w MCReco -e '--runNumber 601229 --inputHITSFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/HITS/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.simul.HITS.e8453_s3873/50events.HITS.pool.root" --conditionsTag="OFLCOND-MC21-SDR-RUN3-07" --geometryVersion="ATLAS-R3S-2021-03-00-00" --maxEvents 25 --preExec="all:from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.AODEDMSet=\"AODFULL\""' --no-output-checks
\ No newline at end of file
+RunWorkflowTests_Run3.py --CI -r -w MCReco -e '--runNumber 601229 --inputHITSFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/HITS/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.simul.HITS.e8453_s3873/50events.HITS.pool.root" --conditionsTag="OFLCOND-MC21-SDR-RUN3-07" --geometryVersion="ATLAS-R3S-2021-03-00-00" --maxEvents 25 --preExec="all:from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.AODEDMSet=\"AODFULL\""' --no-output-checks