HLTCalo: Cherry picking relevant changes from main to 24.0
As discovered in !77245 (closed), some changes that are needed targetted main. The present MR aims to back-port these to 24.0 so the aforementioned MR can proceed.
As discovered in !77245 (closed), some changes that are needed targetted main. The present MR aims to back-port these to 24.0 so the aforementioned MR can proceed.