add PerJet Flavour Uncertainty and constraining Z+jet resp
These two merge requests were previously not propagated to r22. This merge request just contains the changes from these two previously approved merge requests; !50272 (merged) !55439 (merged)
Cheers, Chris.