adding fix for miniAOD definitions of charged particles
Merge pull request #6851 from nhanvtran/puppi-bugfix-for-miniaod

adding puppi fix for miniAOD definitions of charged particles
Merge remote branch 'origin/CMSSW_7_4_X' into CMSSW_7_0_X