Merged refs/pull/6446/head from repository cms-sw
fix for CMSHLT-138 (fix photon et threshold)
Merge pull request #6456 from jalimena/hltIntegration1e34menuPhotonFix

Hlt integration fix for Photon120 paths