Anonymous namespace here can cause build warnings
Merge pull request #6883 from wmtan/FixBuildWarnings

Anonymous namespace here can cause build warnings
Merge remote branch 'origin/CMSSW_7_4_X' into CMSSW_7_0_X