Merge pull request #8967 from edx/max/release-merge-conflicts

AUTHORS

Gemfile

Gemfile.lock

README.rst

...ontentstore/features/component_settings_editor_helpers.py

...contentstore/management/commands/export_convert_format.py

...e/management/commands/tests/test_export_convert_format.py

cms/djangoapps/contentstore/tests/test_course_settings.py

cms/djangoapps/contentstore/tests/test_utils.py

cms/djangoapps/contentstore/utils.py

cms/djangoapps/contentstore/views/certificates.py

cms/djangoapps/contentstore/views/component.py

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

...oapps/contentstore/views/tests/test_credit_eligibility.py

...djangoapps/contentstore/views/tests/test_import_export.py

cms/djangoapps/models/settings/course_details.py

cms/envs/bok_choy.py

cms/envs/devstack.py

cms/envs/test.py

cms/static/coffee/spec/main_spec.coffee