Pylint fixing
Merge pull request #18185 from rallytime/pylint

Pylint fixing
pretty safe
currently safeish
Merge branch 'develop' into with-pylint-pragmas