Fixes to templates for new syntax and also allow for uncommenting tls, tcp variables.