Fix pylint on 2014.7 branch
Merge pull request #18255 from rallytime/more_pylint

Fix pylint on 2014.7 branch