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

Fix of HLT and migration of 721patch1 templates
Merge remote branch 'origin/CMSSW_7_3_X' into CMSSW_7_0_X