Merge branch 'cherry-pick-f679a99f [formerly d34fff328a]-master' into 'master'
Sweeping !12866 from 21.0 to master.
Support for cold back wall of EC cryostat in Calibration Hit Calculator
See merge request atlas/athena!12923
Former-commit-id: 243715c0