Merge "Remove XML support from some v3 API plugins"
Merge "Remove XML support from certificates v3 API"
Merge "Remove XML support from some extension v3 API plugins"
Merge "Remove XML support from admin_password V3 API plugin"
Merge "XenAPI: Tidy calls to get_all_ref_and_rec"
Merge "XenAPI: Speedup get_vhd_parent_uuid"
Merge "Remove duplicated method in mock_key_mgr"
Merge "Add block device mapping objects implementation"
Merge "Move compute API is_volume_backed to BDM objects"
Merge "Make volume_snapshot_{create,delete} use objects"
Merge "Make snapshot_volume_backed use new-world objects"
Merge "Shelve: The snapshot should be removed when delete instance."
Merge "Use utils method when getting instance metadata and system metadata"
Allow deleting instances while uuid lock is held

Avoid issues where locked up operations on the instance prevent it
from being deleted by the user. Reasons for the lock up are a separate
issue and will be handled elsewhere, but terminating the instance
should not affect any tasks anyway. Any modification should already
gracefully handle the instance going away.

For more discussion about the issue see:
http://lists.openstack.org/pipermail/openstack-dev/2013-October/017454.html

This patch was merged once before and had to be reverted in
6b7304d8d38c0f04643bdcd031d682c688c91b28.  It was causing an extremely
large number of errors in gate jobs.  I believe that the case being hit
should be expected with this patch in place, and that it's actually OK.
We expect that the rest of the code will handle this case gracefully.
Simply remove this error message from the code.

Change-Id: I83deae464518fef5abe8fc00bfd0a186de01527b
Partial-Bug: #1248563
Co-authored-by: Russell Bryant <rbryant@redhat.com>
Merge "xenapi: clean up step decorator fake steps"
Merge "libvirt: Review of the code to use module units"
Merge "Make nova-network a "conductor-using service""
Merge "Make nova-network use Network object for get-all-by-host query"
Merge "Make nova-network use NetworkList for remaining "all" queries"
Merge "Make nova-network use Network object for remaining "get" queries"