Fix warnings spotted by clang.
Merge pull request #3743 from degano/ecal_tpg_clangFix_71X

Clang -- Fix warnings spotted by clang in L1.