Fix join() method being called without second parm
Merge branch 'master' of github.com:jalli/puppetlabs-postgresql

Conflicts:
	manifests/server/pg_hba_rule.pp