Sweep NSW EDM changes to master
Finishing the sweep of NSW AOD changes begun in !21471 (merged). Please see https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/12674 and https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/13765 for more details.