Fix of HLT and migration of 721patch1 templates
Merge pull request #6133 from Martin-Grunewald/FixAnd721patch1Template

Fix of HLT and migration of 721patch1 templates