2022-06-21: daily merge of 22.0 into master
Resolved changes to
Projects/AthAnalysis/build_externals.sh
Projects/AthGeneration/build_externals.sh
Projects/AthSimulation/build_externals.sh
Projects/Athena/build_externals.sh
Tools/WorkflowTestRunner/python/References.py
by taking ours (master)