Don't remove six import, only disable for pylint
Merge pull request #18103 from rallytime/add_six_import

Don't remove six import, only disable for pylint