Update templates to be puppet 3.2.1 warning free