2022-08-27: merge of 22.0 into master (!56290) · Merge requests · atlas / athena

Daily sweep/merge of 22.0 branch into master branch for 2022-08-27.

Used git merge --strategy-option theirs upstream/22.0 to give preference to the 22.0 branch code in merge conflicts of:

InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.h
InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.cxx

Edited Aug 27, 2022 by Johannes Elmsheuser

2022-08-27: merge of 22.0 into master