Replaced import six in file /salt/grains/core.py