Fix the rest of the templates for puppet 3.2