Sweeping !38884 from 21.2 to master. Updated ATLAS FTag recommendations for release 21: December 2020 CDI

Atlas Nightlybuildrequested to merge
cherry-pick-24776619060-master into master

Updated ATLAS FTag recommendations for release 21: December 2020 CDI

See merge request !38884 (merged)

Merge request reports