Pylint fix for 2014.7 branch
Merge pull request #16214 from rallytime/pylint

Pylint fix for 2014.7 branch