merge patch
merge patch

Merge branch 'master' of github.com:nimbusproject/cloudinit.d

Conflicts:
	docs/plans/cloudfoundry/01/singlenode.json

nimbusproject/cloudinit.d,buzztroll/cloudinit.d,buzztroll/cloudinit.d,nimbusproject/cloudinit.d