Clang fix.
Merge pull request #4096 from ktf/final-clang-fix

Final clang fix.
Merge remote branch 'origin/CMSSW_7_2_X' into CMSSW_7_0_X