Merge branch 'master' into release

CHANGELOG.rst

cms/djangoapps/contentstore/views/component.py

cms/djangoapps/contentstore/views/public.py

cms/djangoapps/contentstore/views/tests/test_helpers.py

cms/envs/aws.py

cms/static/sass/elements/_xmodules.scss

cms/static/sass/views/_unit.scss

cms/urls.py

common/djangoapps/student/views.py

common/djangoapps/user_api/user_service.py

common/lib/xmodule/xmodule/css/video/accessible_menu.scss

common/lib/xmodule/xmodule/css/video/display.scss

common/lib/xmodule/xmodule/js/fixtures/video_all.html

common/lib/xmodule/xmodule/js/spec/helper.js

common/lib/xmodule/xmodule/js/spec/video/general_spec.js

common/lib/xmodule/xmodule/js/spec/video/resizer_spec.js

...odule/xmodule/js/spec/video/video_accessible_menu_spec.js

...n/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js

...n/lib/xmodule/xmodule/js/spec/video/video_control_spec.js

...on/lib/xmodule/xmodule/js/spec/video/video_player_spec.js