Pylint fix for the 2015.2 branch
Merge pull request #19284 from rallytime/pylint_new_branch

Pylint fix for the 2015.2 branch