More Hlt integration for the Run II 1e34 menu

On top of #6217 

CMSHLT-134: Trigger for Higgs decay to two muons and a photon (master and GRun)
fixes for CMSHLT-138: Photon + Jet control triggers - restore some paths, remove others (master and GRun)