Use instance vars in templates to remove puppet 3 deprecation warnings. pt2
Merge branch 'template-deprecations'