Merge branch 'cherry-pick-e6f78f01 [formerly 7234d71971]-21.0' into '21.0'

Sweeping !16059 from master to 21.0.
Update Overlay Tier-0 test AMI tag

See merge request atlas/athena!16107

Former-commit-id: ca3f71d792b9bfac4926f2f948c8c6c71f9e2d51