Updated default btag discriminators: Forward port from 7_2_X to 7_3_X

Forward port of #5446 (replacement for #5449)