Cleaning up a few quality violations
Merge pull request #4892 from edx/db/marcnu-quality

Cleaning up a few quality violations