Use instance-variable syntax in templates

to avoid deprecation warnings in puppet 3.2
Merge branch 'template-vars' into fixes

* template-vars:
  Use instance-variable syntax in templates