Merged hltTemplatesForRun2In710 from repository perrotta
DiPhoton updates, CMSHLT-76