Reco updates -- Backport btagging changes to 62X.

Fix #892 conflict when merging.