Merge pull request #3673 from cpennington/opaque-keys-merge-master

AUTHORS

CHANGELOG.rst

CONTRIBUTING.rst

README.md

cms/djangoapps/contentstore/features/transcripts.feature

cms/djangoapps/contentstore/features/transcripts.py

cms/djangoapps/contentstore/features/video.feature

cms/djangoapps/contentstore/features/video_editor.feature

cms/djangoapps/contentstore/features/video_editor.py

...pps/contentstore/management/commands/tests/test_import.py

cms/djangoapps/contentstore/tests/test_import.py

cms/djangoapps/contentstore/views/import_export.py

cms/djangoapps/contentstore/views/item.py

cms/djangoapps/contentstore/views/public.py

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

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

cms/envs/aws.py

cms/envs/common.py

cms/envs/devstack.py

cms/static/coffee/spec/main.coffee