more pylint fixes
Merge pull request #8515 from UtahDave/fix_pylint

more pylint fixes