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