Fix compilation warnings
More clang fixes. Should be ok for CMSSW_7_1_X as well.
Even more clang fixes.
Merge pull request #3913 from ktf/almost-final-clang-fixes

Almost final clang fixes