This MR sweeps some previous commits to 21.2 into master based on the discussion here: https://its.cern.ch/jira/browse/ATLASRECTS-4963 We expect the tier0 tests to fail but @mhodgkin has suggested we go ahead with this to get it in for the July Validation deadline