Merge "Replace uuid4() with uuidsentinel"

diff --cc nova/tests/unit/api/openstack/compute/test_evacuate.py
Simple merge

diff --cc nova/tests/unit/api/openstack/compute/test_server_actions.py
Simple merge

diff --cc nova/tests/unit/api/openstack/compute/test_serversV21.py
index d3a05b97d3f5991fc73d3241a2d29f04661d63b3,681c8be0804aee615bd67ebc69c3329a9e1234cf..00884966855aba8abb2d381bc95bfcd905ef5188
--- 1/nova/tests/unit/api/openstack/compute/test_serversV21.py
--- 2/nova/tests/unit/api/openstack/compute/test_serversV21.py
+++ b/nova/tests/unit/api/openstack/compute/test_serversV21.py
@@@ -23,10 -24,9 +23,11 @@@ import iso860
  import mock
  from mox3 import mox
  from oslo_policy import policy as oslo_policy
 +from oslo_serialization import base64
  from oslo_serialization import jsonutils
 +from oslo_utils import encodeutils
  from oslo_utils import timeutils
+ from oslo_utils import uuidutils
  import six
  from six.moves import range
  import six.moves.urllib.parse as urlparse

diff --cc nova/tests/unit/api/openstack/compute/test_versions.py
Simple merge