Backport of Fix ordering of licence in templates into release/1.2.x #2677
backport/ashwin/fix-helm-templates/arguably-stable-malamute% was force-pushed and no longer has any new commits.
Pushing new commits will allow the pull request to be re-opened.