Merged hltTemplatesForRun2 from repository perrotta
Updates for egamma