Merged hltTemplatesForRun2In712 from repository perrotta
EGamma updates as in CMSHLT-79 and CMSHLT-80