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.

lib/ansible/template/__init__.py

@@ -27,25 +27,25 @@ import re
 from io import StringIO
 from numbers import Number
 
-from jinja2 import Environment
-from jinja2.loaders import FileSystemLoader
-from jinja2.exceptions import TemplateSyntaxError, UndefinedError
-from jinja2.utils import concat as j2_concat, missing
-from jinja2.runtime import Context, StrictUndefined
-from ansible import constants as C
-from ansible.compat.six import string_types, text_type
-from ansible.errors import AnsibleError, AnsibleFilterError, AnsibleUndefinedVariable
-from ansible.plugins import filter_loader, lookup_loader, test_loader
-from ansible.template.safe_eval import safe_eval
-from ansible.template.template import AnsibleJ2Template
-from ansible.template.vars import AnsibleJ2Vars
-from ansible.module_utils._text import to_native, to_text
-
 try:
     from hashlib import sha1
 except ImportError:
     from sha import sha as sha1
 
+from jinja2 import Environment
+from jinja2.loaders import FileSystemLoader
+from jinja2.exceptions import TemplateSyntaxError, UndefinedError
+from jinja2.utils import concat as j2_concat, missing
+from jinja2.runtime import Context, StrictUndefined
+
+from ansible import constants as C
+from ansible.errors import AnsibleError, AnsibleFilterError, AnsibleUndefinedVariable
+from ansible.module_utils.six import string_types, text_type
+from ansible.module_utils._text import to_native, to_text
+from ansible.plugins import filter_loader, lookup_loader, test_loader
+from ansible.template.safe_eval import safe_eval
+from ansible.template.template import AnsibleJ2Template
+from ansible.template.vars import AnsibleJ2Vars
 
 try:
     from __main__ import display
@@ -53,6 +53,7 @@ except ImportError:
     from ansible.utils.display import Display
     display = Display()
 
+
 __all__ = ['Templar']
 
 # A regex for checking to see if a variable we're trying to

lib/ansible/template/safe_eval.py

@@ -20,12 +20,12 @@ __metaclass__ = type
 import ast
 import sys
 
-from ansible.compat.six import string_types
-from ansible.compat.six.moves import builtins
-
 from ansible import constants as C
+from ansible.module_utils.six import string_types
+from ansible.module_utils.six.moves import builtins
 from ansible.plugins import filter_loader, test_loader
 
+
 def safe_eval(expr, locals={}, include_exceptions=False):
     '''
     This is intended for allowing things like:

lib/ansible/template/vars.py

@@ -19,8 +19,9 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible.compat.six import iteritems
 from jinja2.utils import missing
+
+from ansible.module_utils.six import iteritems
 from ansible.module_utils._text import to_native