Update template.yaml to 1.6.x

Add missing strings to template.yaml
Merge branch 'dev'