Use six string types instead of basestring

To increase our python3 compatability we should
attempt to use the six module for known issues
that are likely to happen in python3 when comparing
to string types.

Change-Id: Ib6fc32138e218c8b45023ca37d87b742694b8349