HLT 720 template for 73X

HLT 720 template for 73X, incl. cleanup of addON tests.
Includes PR #5864 which thus could be closed!