Integration of new jet flavour into PAT: Backport from 7_1_X to 6_2_X_SLHC

Backport of #3509 but with the old jet flavor definition left as default.