Vagrant testing
Merge branch 'v4update' of https://github.com/perfectsine/chef-openstack into v4update

Conflicts:
	recipes/set_cloudnetwork.rb