Update templates for Puppet 3 compat