Fix template variable deprecation warnings for Puppet > 3.2