Fixes to make run2-patches work with Gaudi v37, LCG 104, gcc13, C++20
- Do not use deprecated UNLIKELY macro
- backports from !3626 (merged) and !3449 (merged)
Not that to work with LCG 104 we need !3657 (merged) too.
Not that to work with LCG 104 we need !3657 (merged) too.