Fix failed inheritance in descriptor.
Merge branch 'anton/video-player-grading' of github.com:edx/edx-platform into anton/video-player-grading
Merge branch 'anton/video-player-grading' of github.com:edx/edx-platform into anton/video-player-grading