fixup! Merge pull request #4152 from edx/db/code-ownership