bump concourse/garden in vagrant-bosh manifest
Merge branch 'master' into develop

Signed-off-by: Onsi Fakhouri <onsi@pivotal.io>

Conflicts:
	manifests/vagrant-bosh.yml