Merge "Switch all uses of urlparse to import from six"