Pylint fixes
Merge pull request #14208 from rallytime/pylint_fixes

Pylint fixes