Merge branch 'cherry-pick-37d93e8e [formerly 8121f3fd2e]-21.0' into '21.0'

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!14570

Former-commit-id: 3166a6a4567ff132f9a033028e4d0b84adb8e016