Update templates for puppet 3.2 compat