Merge branch 'additional_jet_labels' into 'master'

Additional jet labels

See merge request !671
78 jobs for !671 with additional_jet_labels into master in 19 minutes and 54 seconds (queued for 1 minute and 57 seconds)