Bundle a new version of python-six for compatibility along with some code to make it easy for distributions to override the bunndled copy if they have a new enough version.

lib/ansible/plugins/action/__init__.py

@@ -28,7 +28,7 @@ import stat
 import tempfile
 import time
 
-from six import binary_type, text_type, iteritems
+from ansible.compat.six import binary_type, text_type, iteritems
 
 from ansible import constants as C
 from ansible.errors import AnsibleError, AnsibleConnectionFailure

lib/ansible/plugins/action/set_fact.py

@@ -18,7 +18,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from six import iteritems
+from ansible.compat.six import iteritems
 
 from ansible.errors import AnsibleError
 from ansible.plugins.action import ActionBase