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/executor/play_iterator.py

@@ -21,11 +21,11 @@ __metaclass__ = type
 
 import fnmatch
 
-from six import iteritems
+from ansible.compat.six import iteritems
 
 from ansible import constants as C
 
-from ansible.errors import *
+from ansible.errors import AnsibleError
 from ansible.playbook.block import Block
 from ansible.playbook.task import Task