Command-line cherry-pick of !57755, !57847, !58364 from master into 22.0

Alexander Naip Tuna requested to merge tuna/athena:22.0 into 22.0

Development of MuonNSWCommonDecode has proceeded in master, and we'd like to catch up 22.0 with master.

There are a couple commits from master which I think need to be cherry-picked into 22.0. I believe they're all included here. I used the command line because gitlab's cherry-pick interface gave an error.

cc @sfrances

Merge request reports