Introduce Tim Martin's bug fix into the legacy (Run2) monitoring framework, see ATR-20986. The update is successfully tested on the ART MC test file of March 10th 2020.