Merge 21.0.116 into 21.3

John Derek Chapman requested to merge jchapman/athena:Merge21.0.116into21.3 into 21.3

This merge request merges all the changes that were made to the 21.0 branch between the release release/21.0.116 and the previous release release/21.0.115.

Below is the full list of merge requests that were included between these two tags:

Link to the full diff between release/21.0.116 and release/21.0.115 is available at https://gitlab.cern.ch/atlas/athena/compare/release/21.0.115...release/21.0.116

Merge request reports