Merge pull request #7302 from edx/alawibaba/hotfix-cdn-experiment

cms/envs/common.py

common/djangoapps/cors_csrf/decorators.py

common/djangoapps/cors_csrf/middleware.py

common/djangoapps/cors_csrf/tests.py

common/djangoapps/cors_csrf/tests/__init__.py

common/djangoapps/cors_csrf/tests/test_decorators.py

common/djangoapps/cors_csrf/tests/test_middleware.py

common/djangoapps/enrollment/views.py

common/djangoapps/status/status.py

common/djangoapps/status/tests.py

common/lib/xmodule/xmodule/video_module/video_module.py

common/test/db_cache/bok_choy_data.json

common/test/db_cache/bok_choy_schema.sql

lms/envs/aws.py

lms/envs/common.py

lms/templates/navigation-edx.html

lms/templates/navigation.html

lms/templates/video.html