Merged 7_2_2_patch1-updateTopRefSel from repository cms-analysis-tools
Clean-up.
Fix b-tag discriminator.