Fix bok-choy tests.
Merge branch 'anton/video-player-grading' of https://github.com/edx/edx-platform into anton/video-player-grading