Pylint fixes.
Merge pull request #8650 from cro/pylint_19nov

Pylint fixes.