Merge remote branch 'origin/CMSSW_7_4_X' into CMSSW_7_0_X

Merge remote branch 'origin/CMSSW_7_4_X' into CMSSW_7_0_X

Merge remote branch 'origin/CMSSW_7_4_X' into CMSSW_7_0_X

Merge remote branch 'origin/CMSSW_7_4_X' into CMSSW_7_0_X

Merge pull request cms-sw#6700 from Martin-Grunewald/HLTfor74Xpre1

HLT update using most-recent ConfDB templates

Merge pull request cms-sw#6698 from ktf/fix-warning

Fix warning on gcc 4.9.1

Merge pull request cms-sw#6664 from Martin-Grunewald/L1fixMap74

L1T/74X: Add missing postls1-customisation of hltL1GtObjectMap

Merge pull request cms-sw#6698 from ktf/fix-warning

Fix warning on gcc 4.9.1

Merge pull request cms-sw#6664 from Martin-Grunewald/L1fixMap74

L1T/74X: Add missing postls1-customisation of hltL1GtObjectMap

Merge pull request cms-sw#6595 from mtosi/from-CMSSW_7_3_X_2014-11-25…

…-0200_fixTrackClusterRemover

fix track cluster remover template definition