Merge pull request #10829 from edx/rc/2015-12-08

AUTHORS

cms/djangoapps/contentstore/tests/test_orphan.py

cms/djangoapps/contentstore/views/certificates.py

cms/djangoapps/contentstore/views/course.py

cms/djangoapps/contentstore/views/item.py

cms/djangoapps/contentstore/views/program.py

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

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

cms/envs/aws.py

cms/envs/bok_choy.env.json

cms/envs/common.py

cms/envs/devstack.py

cms/envs/test.py

cms/lib/studio_tabs.py

cms/lib/tests/test_studio_tabs.py

cms/static/images/studio-logo.png

...ic/js/certificates/spec/views/certificate_preview_spec.js

cms/static/js/certificates/views/certificate_preview.js

cms/static/js/index.js

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