Backport of some fixes in master

Marco Clemencicrequested to merge
clemenci/lhcb-conditions-database:jonrob/all-pmts-active into jonrob/all-pmts-active

This is just a backport of:

with minor adaptations.

See lhcb/Detector!418 (comment 7790113)

Merge request reports