Merge pull request #6314 from edx/release

cms/djangoapps/contentstore/tests/utils.py

cms/djangoapps/contentstore/views/__init__.py

cms/djangoapps/contentstore/views/course.py

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

cms/djangoapps/contentstore/views/videos.py

cms/envs/aws.py

cms/envs/common.py

cms/static/build.js

cms/static/coffee/spec/main.coffee

cms/static/js/factories/asset_index.js

cms/static/js/factories/videos_index.js

cms/static/js/models/active_video_upload.js

cms/static/js/spec/views/active_video_upload_list_spec.js

cms/static/js/spec/views/assets_spec.js

cms/static/js/spec/views/previous_video_upload_list_spec.js

cms/static/js/spec/views/previous_video_upload_spec.js

cms/static/js/utils/date_utils.js

cms/static/js/views/active_video_upload.js

cms/static/js/views/active_video_upload_list.js

cms/static/js/views/assets.js