VMware: fix image snapshot with attached volume

A snapshot of a instance with an attached volume will result in
the wrong volume being uploaded to glance. The reason for this
are as follows:
1. the last image in the list of images would be exported
2. the base image would not be exported but the first found

The same happens with a VM rescue if there is a cinder volume
attached.

The solution is to search for an image that contains the instance
UUID.

Change-Id: Ic85b0ffd4f1c34f10d07b1a198eaad2030803d6f
Closes-bug: #1243193
(cherry picked from commit 9ceee09594cd35c264cab3e3b3d1d80aaa3fdbc4)

Conflicts:

	nova/virt/vmwareapi/vm_util.py
	nova/virt/vmwareapi/vmops.py

Change-Id: I6b9febbfe4e4e6ecf5d31a2b09a4319b07696f9c
Fixed a problem in iSCSI multipath

Multipathing for attach volume and detach volume operations
doesn't work properly if there are different targets
associated with different portals for a mulitpath device.

Closes-Bug: #1266051
(cherry picked from commit 429ac4dedd617f8c1f7c88dd8ece6b7d2f2accd0)

Conflicts:
	nova/tests/virt/libvirt/test_libvirt_volume.py
	nova/virt/libvirt/volume.py

Change-Id: Iab316526cf64de60325d90043f73fa3e83fafb4e
Fix InstanceNotFound error in _delete_instance_files

Currently the cleanup_running_deleted_instances peroidic task
failed with InstanceNotFound exception, this is because the
db query is not including the deleted instance while
_delete_instance_files() in libvirt driver.

Closes-bug: #1280140

Change-Id: Ie65ff255ad3c582a71db93b07304a21d4976a193
(cherry picked from d835163759527a651f3c4f2109ca0fdc3e968d37)
Merge "Fixed a problem in iSCSI multipath" into stable/havana
Merge "Fix InstanceNotFound error in _delete_instance_files" into stable/havana
Merge "VMware: fix image snapshot with attached volume" into stable/havana
Merge remote-tracking branch 'upstream/stable/havana' into stable/havana