Backporting #6121 to 7_2_X
Merge pull request #6223 from trtomei/HTFromCaloTowers72X

Backporting #6121 to 7_2_X