pylint cleanup.
Merge pull request #5560 from edx/benp/improve-pylint-violations

pylint cleanup.