Fix HLT tests for GTs (62X)
Merge pull request #2256 from Martin-Grunewald/HLTaddON62X

HLT fixes -- Fix HLT tests for GTs (62X)