Fix for jet flavour clustering: Backport from 7_1_X to 6_2_X_SLHC

Backport of #3994