Three Puppet 2.6 fixes

Tested on 2.6.17 and 3.1.1 with a simple manifest installing the server, client and a database.