Template migration and filter fix for Egamma
Merge pull request #1424 from Martin-Grunewald/EgammaUpdate

HLT fix -- Template migration and filter fix for Egamma