Update templates for Puppet 3
Merge branch 'puppet3'