Update common templates for Puppet 3