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/plugins/callback/logentries.py

@@ -61,7 +61,6 @@ import random
 import time
 import codecs
 import uuid
-from ansible.compat.six.moves import configparser
 
 try:
     import certifi
@@ -75,6 +74,7 @@ try:
 except ImportError:
     HAS_FLATDICT = False
 
+from ansible.module_utils.six.moves import configparser
 from ansible.plugins.callback import CallbackBase
 
 

lib/ansible/plugins/callback/mail.py

@@ -24,7 +24,7 @@ import os
 import smtplib
 import json
 
-from ansible.compat.six import string_types
+from ansible.module_utils.six import string_types
 from ansible.module_utils._text import to_bytes
 from ansible.plugins.callback import CallbackBase
 

lib/ansible/plugins/callback/profile_tasks.py

@@ -27,12 +27,14 @@ import collections
 import os
 import time
 
+from ansible.module_utils.six.moves import reduce
 from ansible.plugins.callback import CallbackBase
-from ansible.compat.six.moves import reduce
+
 
 # define start time
 t0 = tn = time.time()
 
+
 def secondsToStr(t):
     # http://bytes.com/topic/python/answers/635958-handy-short-cut-formatting-elapsed-time-floating-point-seconds
     rediv = lambda ll, b: list(divmod(ll[0], b)) + ll[1:]