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