Fix problems with the Puppet manifest when PostgreSQL's default encoding isn't UTF-8

fixes #6211