Fix pylint on 2014.7
Merge pull request #16278 from rallytime/pylinting

Fix pylint on 2014.7