Merge "Switch to oslo_utils.uuidutils"

diff --cc neutron/cmd/sanity/checks.py
Simple merge

diff --cc neutron/db/db_base_plugin_v2.py
Simple merge

diff --cc neutron/db/securitygroups_db.py
Simple merge

diff --cc neutron/extensions/securitygroup.py
Simple merge

diff --cc neutron/tests/functional/agent/l3/test_namespace_manager.py
Simple merge

diff --cc neutron/tests/unit/agent/l3/test_agent.py
Simple merge

diff --cc neutron/tests/unit/dummy_plugin.py
Simple merge