Backport of Cross Section machinery and GenJet config change to 71x