Merge branch 'develop' into vmware-guesttype

Conflicts:
	app/views/compute_resources_vms/form/_vmware.html.erb
	app/views/compute_resources_vms/form/vmware/_network.html.erb