Merge "oslo: migrate to namespace-less import paths"

diff --cc neutron/agent/l3/agent.py
Simple merge

diff --cc neutron/common/repos.py
Simple merge

diff --cc neutron/db/migration/cli.py
Simple merge

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

diff --cc neutron/tests/unit/vmware/apiclient/fake.py
Simple merge

diff --cc neutron/tests/unit/vmware/test_nsx_plugin.py
Simple merge