Clean-up.
Fix b-tag discriminator.
Merge pull request #6781 from vadler/72X-updateTopRefSel

72X - update TopRefSel