Updated PFRecoTauDiscriminationByNProngs
Merge pull request #3540 from slehti/from-CMSSW_7_1_0_pre6

PF -- Updated PFRecoTauDiscriminationByNProngs