BandQ development towards 28th March

B&Q internal deadline: 17th March

This MR needs to be tested together with lhcb-datapkg/ParamFiles!129 (merged) and lhcb-datapkg/ParamFiles!134 (merged) because lines added in !4477 (merged) and !4559 (merged) depends on them；