Fix more clang issues.
Merge pull request #3592 from ktf/fix-more-clang

Clang -- Fix more clang issues.
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X