Merge "Use six.moves.urllib.parse instead of urlparse"

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

diff --cc neutron/plugins/nicira/api_client/request.py
Simple merge

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