Merge branch 'cherry-pick-fe52d562 [formerly e68ac35a12]-master' into 'master'

Sweeping !14813 from 21.0 to master.
han configuration file update for the modification of the heavyions_run.config…

See merge request atlas/athena!14879

Former-commit-id: f495d29c