fix libguestfs mount order when inspecting

variable `mounts` sorted value is
[
    ('/boot', '/dev/vda1'),
    ('/', '/dev/vda2'),
    ('/var', '/dev/vda5'),
    ('/home', '/dev/vda6'),
    ('/home/q', '/dev/vda7')
]
but `/boot` directory is in `/` partition.

Fixes: Bug #1210371
Change-Id: I3d9cd59237bc4fc277415104c9170d2e372a1c25
Cherry picked: a8613dd59383c150ac8762398838236759bad7b1
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
fallocate image only when user has write access

Libvirt will change instance's ownership when the instance became power
off which will make nova-compute service unable to hard reboot instance
bacause the nova-compute service has not write access. This commit will
allocate space for image only the first time we create image.

Fixes bug: 1200113
Conflicts: nova/tests/test_imagebackend.py
Change-Id: Id81b09ade5f870665f5ffabab3cde144c6dec210
Cherry-picked: c246fb37e20197be27264a36515725233085df1d
Merge "fallocate image only when user has write access" into stable/grizzly
Merge "fix libguestfs mount order when inspecting" into stable/grizzly
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
Manual merge branch 'stable/grizzly' of https://github.com/openstack/nova into grizzly/stable

Conflicts:
	nova/tests/network/test_quantumv2.py