Merge pull request #10885 from edx/release

common/djangoapps/course_modes/admin.py

common/djangoapps/course_modes/models.py

common/djangoapps/student/views.py

common/djangoapps/util/views.py

common/templates/course_modes/choose.html

lms/djangoapps/certificates/models.py

lms/djangoapps/courseware/tests/test_views.py

lms/djangoapps/courseware/views.py

lms/djangoapps/instructor/enrollment.py

lms/djangoapps/instructor_task/tests/test_tasks_helper.py

lms/djangoapps/mobile_api/users/tests.py

lms/djangoapps/shoppingcart/models.py

lms/djangoapps/shoppingcart/tests/test_models.py

lms/djangoapps/shoppingcart/tests/test_views.py

...financial-assistance/financial_assistance_form_factory.js

...financial-assistance/models/financial_assistance_model.js

...assistance/templates/financial_assessment_form.underscore

...tance/templates/financial_assessment_submitted.underscore

...ancial-assistance/views/financial_assistance_form_view.js

...nancial-assistance/financial_assistance_form_view_spec.js