Merge pull request #8958 from edx/mattdrayer/SOL-981

cms/djangoapps/contentstore/tests/test_course_settings.py

cms/djangoapps/contentstore/views/certificates.py

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

cms/static/js/certificates/models/certificate.js

...tic/js/certificates/spec/views/certificate_editor_spec.js

cms/static/js/certificates/views/certificate_editor.js

cms/static/sass/views/_certificates.scss

cms/templates/js/certificate-editor.underscore

common/djangoapps/util/organizations_helpers.py

common/djangoapps/util/tests/test_organizations_helpers.py

lms/djangoapps/certificates/tests/test_api.py

lms/djangoapps/certificates/tests/test_views.py

lms/djangoapps/certificates/views.py

lms/djangoapps/courseware/tests/test_views.py

lms/envs/common.py

lms/envs/devstack.py

lms/envs/test.py

lms/templates/certificates/_accomplishment-rendering.html

requirements/edx/github.txt