Merge branch 'cherry-pick-b7fad22926-master' into 'master'

Sweeping !8214 from 21.0 to master.
ATR-17608: Re-enabling 4 calo cluster moments for online MVA Tau Energy Scale

See merge request atlas/athena!8260