Fix forward port 72x

This is the pull request which aligns CMSSW_7_2_X to CMSSW_7_1_X. The only merge conflicts where in the GT (where the 72X version has been picked up) and in `DataFormats/PatCandidates/src/TauPFSpecific.cc`, where again I picked up the `CMSSW_7_2_X` version.