Fix variables to be instance scope in template

Fixing variables to be instance scope in template as part of cleaning up deprecation warnings on the puppet master.