Merge branch 'cherry-pick-3166a6a456-master' into 'master'

Sweeping !14570 from 21.0 to master.
Sweeping !14558 from 21.2 to 21.0.Fixing the PATJobTransforms to allow the MCP code to be processed on tier0

See merge request atlas/athena!14687