1388 - Update puppet-postgresql module to version 4.0.0
Merge branch 'master' of https://github.com/adblockplus/infrastructure into 1327-forum-migration

Conflicts:
	dependencies
	modules/discourse/files/init-discourse
	modules/discourse/manifests/init.pp