Fix duplicate definitions in ROOT macros
Merge pull request #6852 from wmtan/FixDuplicateDefinitions

Fix duplicate definitions in ROOT macros
Merge remote branch 'origin/CMSSW_7_4_X' into CMSSW_7_0_X