Fix one port can be attached to more devices

a port attached to some device should not be attached to another device again

Fixes: bug #1204850
(cherry picked from commit c9c634150f740d2d2c2146c8e6d583d73d8b587c)

Conflicts:
	nova/network/quantumv2/api.py
	nova/tests/network/test_quantumv2.py

Change-Id: I60de0fa265358ac5b5e1b2c8f370862b32f9e724
VMware: Network fallback in case specified one not found

In the case that opqaue network does not match the bridge ID then
we will fall back on a predefined network (configurable by the admin
via 'integration_bridge' in the 'vmware' section).

Fixes bug 1225002

(cherry picked from commit a0546fd3f42c37e8cd6e4e9b70d59ae1e689b4b7)

Conflicts:

	nova/tests/test_vmwareapi_vif.py
	nova/virt/vmwareapi/vif.py

Change-Id: Idd28986aac12461754194d3fdd04004748a14893
Merge "Fix one port can be attached to more devices" into stable/grizzly
Merge "VMware: Network fallback in case specified one not found" into stable/grizzly
Merge remote-tracking branch 'upstream/stable/grizzly' into stable/grizzly