Cherry pick changes from !28293
This merged several fixes for flavor tagging that were never propagated from the 21.2 branch.
Adding FlavorTagDiscriminants
as a dependency for BTagging
isn't needed right away, but both @guirriec and I are working on changes which will require this. I'm making the change now to preempt a merge conflict later.