Fix pylint on 2014.7 again
Fix a few pylints that I missed the first time
Merge pull request #16287 from rallytime/fix_pylint

Fix pylint on 2014.7 again