Workaround PUP-3035 - create /var/run/puppet before starting
Merge branch 'master' of github.com:beezly/vagrant-puppetserver-model

Conflicts:
	manifests/default.pp