Updated openstack/openstack
Project: openstack/ceilometer  eb39b6439838f5df4c16c58ab902ef482f30a89b

use urlparse from six

- six provides compatibility support for urlparse. lets use it.
- cleanup import lines to be consistent.

Change-Id: I655b64888a29dc1f34e51216f06b83e84fe25970