Backward compatible fixes to run2-patches for Gaudi v39

This MR collects together backward compatible commits to allow migration of run2-patches to Gaudi v39