Tau DQM fix: HLTEgammaGeneric and HLT2PhotonTau filters for (72X)

Backport of https://github.com/cms-sw/cmssw/pull/6174 and https://github.com/cms-sw/cmssw/pull/6191 to 72X.