Fix for jet flavor lepton selection and possible out of range exception: Backport from 7_2_X to 7_1_X

Backport of #4482