Add our own six import fixes and path lib2to3 touch import

This way we the reported pylint fix includes the `six` import from `salt.ext`