synchronize merge requests from the InnerDetector domain made in 21.1/21.0-TrigMC related to ATR-19009
The request is a cherry-pick of several merge requests which are present in the 21.1 releases but did not make it into the master. They were identified as having InnerDetector label and were not related to the P1 ID monitoring.
There are also some further updates mostly to remove compilation warnings (variable naming convention)