follow changes in LHCb!3150

Merged Gerhard Raven requested to merge cleanup-olddet into master

must be applied in conjunction with LHCb!3150 (merged)

Merge request reports