Fix compilation warnings
More clang fixes. Should be ok for CMSSW_7_1_X as well.
Last round of clang fixes.
Avoid link time issue.
Merge pull request #4004 from ktf/more-clang-fixes

Backport of clang fixes from CMSSW_7_1_CLANG_X branch