HLT update using most-recent ConfDB templates
Merge pull request #6700 from Martin-Grunewald/HLTfor74Xpre1

HLT update using most-recent ConfDB templates
Merge remote branch 'origin/CMSSW_7_4_X' into CMSSW_7_0_X