Update module_utils.six to latest (#22855)

* Update module_utils.six to latest

We've been held back on the version of six we could use on the module
side to 1.4.x because of python-2.4 compatibility.  Now that our minimum
is Python-2.6, we can update to the latest version of six in
module_utils and get rid of the second copy in lib/ansible/compat.

test/units/mock/procenv.py

@@ -25,8 +25,8 @@ import json
 
 from contextlib import contextmanager
 from io import BytesIO, StringIO
-from ansible.compat.six import PY3
 from ansible.compat.tests import unittest
+from ansible.module_utils.six import PY3
 from ansible.module_utils._text import to_bytes
 
 

test/units/mock/yaml_helper.py

@@ -1,10 +1,10 @@
 import io
 import yaml
 
+from ansible.module_utils.six import PY3
 from ansible.parsing.yaml.loader import AnsibleLoader
 from ansible.parsing.yaml.dumper import AnsibleDumper
 
-from ansible.compat.six import PY3
 
 class YamlTestUtils(object):
     """Mixin class to combine with a unittest.TestCase subclass."""