Sweeping !36401 from 21.0 to master. AFP webdisplay [rel 21] (!36595) · Merge requests · atlas / athena · GitLab

GitLab jobs artifacts no longer stored forever as of Monday, November 4th 08:30h. Further information under https://cern.ch/otg0152576

Atlas Nightlybuild requested to merge cherry-pick-6ec2ea6a5f0-master into master Sep 22, 2020

AFP webdisplay [rel 21]

See merge request !36401 (merged)