Resurrect needed cfi files for HLT ConfDB parsing (each plugin needs a cfi)
Merge pull request #2346 from Martin-Grunewald/RecoTauTagRecoTauFix

HLT fixes -- Resurrect needed cfi files for HLT ConfDB parsing (each plugin needs a c...
Merge remote branch 'origin/CMSSW_7_0_X' into CMSSW_7_0_X