Ignore errors when deleting non-existing vifs

If an instance fails during its network creation (for example
if the network-vif-plugged event doesn't arrive in time) a
subsequent delete will also fail when it tries to delete the
vif, leaving the instance in a Error(deleting) state.

This can be avoided by including the "--if-exists" option to
the ovs-vsctl command so that the command doesn't fail if the
vif doesn't exist.

Change-Id: Ic613c9d6e0619f51fcd931e62f6d6bce404ebe81
Closes-bug: #1308544
(cherry picked from commit 476dc5efcdb11c9859b062dc69a8c205e69be861)
Fixes missing ec2 api address disassociate error on failure

Fixes ec2 api address disassociate so that the ec2 error
InvalidAssociationID.NotFound is returned when it is passed an
invalid association rather than returning success. Note this is
slightly different than the original bug report but the type
of failure has changed since the bug was originally filed.

Change-Id: I10034a2fed62d4e93bc384aef3ff594b66e285f2
Closes-Bug: 1179816
(cherry picked from commit 00d8c334bbfaef3ffec4b04b494e609740b96253)
Sync process utils from oslo

This patch backports the missing change to fix ssh_execute password leak

------------------------------------------------
The sync pulls in the following changes:

105169f8 - Mask passwords in exceptions and error messages (SSH)
-----------------------------------------------

Closes-Bug: 1377981
Change-Id: Ie0caf32469126dd9feb44867adf27acb6e383958
VMWare: Fix VM leak when deletion of VM during resizing

During the VM resizing, before VM arrive RESIZED state, driver
migrate_disk_and_power_off will initially rename orginal vm
'uuid' to be 'uuid-orig' and clone a new vm with 'uuid' name.
When deletion VM is triggered at this time window, it wouldn't
be able to delete the VM uuid-orig in VCenter and so cause VM leak.
As VM task state will be set to 'deleting' and it can not be used to
determine the resize migrating/migrated state, this fix will
attempt to delete orig VM within destroy phase.

Conflicts:
	nova/tests/virt/vmwareapi/test_driver_api.py
	nova/virt/vmwareapi/vmops.py

Closes-Bug: #1359138

NOTE: the aformentioned patch broke Minesweeper. The fix was also
cherry picked from commit e464bc518e8590d59c2741948466777982ca3319.
This was to do two things:
1. Solve the actual bug
2. Ensure that the unit tests and Minesweeper passed

Change-Id: I7598afbf0dc3c527471af34224003d28e64daaff
(cherry-picked from e1f8664c9fa83f77f5bb763ffcc3157905ed954c)
Merge "VMWare: Fix VM leak when deletion of VM during resizing" into stable/icehouse
VMware: validate that VM exists on backend prior to deletion

Attempting to delete an instance that does not exist on the backend
throws an exception (for example UnregisterVM may return this when
running the CI).

Fixes: bug #1300788

(cherry picked from commit 98fb5e56ef96c0c6a8754276e5f8c9c0b7e50fed)

Change-Id: I1b95caec2dad6580db576aa6f80f47913b7c066e
Merge "Sync process utils from oslo" into stable/icehouse
Merge "VMware: validate that VM exists on backend prior to deletion" into stable/icehouse
Merge "Fixes missing ec2 api address disassociate error on failure" into stable/icehouse
Merge "Ignore errors when deleting non-existing vifs" into stable/icehouse
Merge remote-tracking branch 'upstream/stable/icehouse' into stable/icehouse