Merge pull request #333 from edx/jonahstanley/fix-flakey-video-test

cms/djangoapps/contentstore/features/advanced-settings.py

cms/djangoapps/contentstore/features/checklists.py

cms/djangoapps/contentstore/features/common.py

cms/djangoapps/contentstore/features/course-settings.py

cms/djangoapps/contentstore/features/course-team.py

cms/djangoapps/contentstore/features/course-updates.py

cms/djangoapps/contentstore/features/grading.py

cms/djangoapps/contentstore/features/problem-editor.py

cms/djangoapps/contentstore/features/section.py

cms/djangoapps/contentstore/features/signup.py

...ps/contentstore/features/studio-overview-togglesection.py

cms/djangoapps/contentstore/features/subsection.py

cms/djangoapps/contentstore/features/video.py

common/djangoapps/terrain/ui_helpers.py

lms/djangoapps/courseware/features/login.py

lms/djangoapps/courseware/features/problems.py

lms/djangoapps/courseware/features/problems_setup.py

lms/djangoapps/courseware/features/registration.py

lms/djangoapps/courseware/features/signup.py