Check for filters of HLT2Photon(PF)Tau type added.

Backport of #6174 to 72X.