Merge release/21.3.12 and release/21.3.13 into 21.9 branch
This merge request merges the changes from the 21.3 branch between release/21.3.11 and release/21.3.13 (including the changes from the 21.0 branch between release/21.0.94 and release/21.0.95) into the 21.9 branch. This is done via a merge of release/21.3.13. (Last 21.3 release to be merged into 21.9 was release/21.3.11.)
release/21.0.95 is a Tier0 release. It alters the full simulation output. release/21.3.12 is otherwise FT0-preserving. release/21.3.13 alters the Trigger output (!21472 (merged))
Here is the full diff between https://gitlab.cern.ch/atlas/athena/compare/release/21.3.11...release/21.3.13