Take advantage of changes in Rec!2141

Olli Luptonrequested to merge
olupton_follow_upstream_changes into master

This takes advantage of some improvements in Rec!2141 (merged).

To be tested with LHCb!2661 (merged) and Rec!2141 (merged).

cc: @apearce @mvesteri @nnolte

Merge request reports