Take care of some Issues for Calorimeter definition etc
Remove overlap between Calo and Muon
Merge completed
Merge pull request #2163 from bsunanda/bsunanda/Phase2HE_8

Phase2 HE