Merge "Use import from six.moves to import the ConfigParser module"