Video pipeline PR tweaks
Merge branch 'mobile/video-pipeline' of https://github.com/edx/edx-platform into mobile/video-pipeline