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...
Fix gcc 4.9.0 issues in HLT.
Add missing include to compile with gcc4.9.0.
Merge pull request #2348 from ktf/fix-hlt-gcc490-issues

Fix gcc 4.9.0 issues in HLT.
Merge pull request #2349 from ktf/dataformats-math-fix-gcc490

GCC 4.9.0 -- Add missing include to compile DataFormats/Math.
Merge remote branch 'origin/CMSSW_7_0_X' into CMSSW_7_0_X
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X