fix broken master regarding pep8 number of blank lines
Merge pull request #6089 from edx/cdodge/pep8-fixes

fix broken master regarding pep8 number of blank lines