Fix some pylint errors
Merge pull request #19223 from rallytime/pylint_fix

Fix some pylint errors