Fix pylint disable pragmas that were pep8 violations
Merge pull request #2997 from edx/zoldak/fix-pragma-pep8

Fix pylint disable pragmas that were pep8 violations