various pylint fixes
Merge pull request #8514 from UtahDave/fix_pylint

various pylint fixes