Sweeping !12511 from 21.0 to master. Update hancool uploads, as per ATLASDQ-547 See merge request atlas/athena!12514 Former-commit-id: c480b60b