Fix HLT tests for GTs (7XY)
Merge pull request #2257 from Martin-Grunewald/HLTaddON7X

HLT fix -- Fix HLT tests for GTs (7XY)
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