Merge pull request #11026 from edx/patch/2015-12-21

common/djangoapps/student/models.py

lms/djangoapps/certificates/models.py

lms/djangoapps/instructor/views/api.py

lms/djangoapps/instructor/views/instructor_dashboard.py

lms/djangoapps/instructor_task/tasks_helper.py

lms/djangoapps/instructor_task/tests/test_tasks_helper.py

lms/djangoapps/support/serializers.py

...oapps/support/static/support/js/collections/enrollment.js

...jangoapps/support/static/support/js/enrollment_factory.js

...djangoapps/support/static/support/js/models/enrollment.js

...ort/static/support/js/spec/collections/enrollment_spec.js

.../support/static/support/js/spec/models/enrollment_spec.js

...support/static/support/js/spec/views/certificates_spec.js

...ort/static/support/js/spec/views/enrollment_modal_spec.js

...s/support/static/support/js/spec/views/enrollment_spec.js

...port/static/support/js/spec_helpers/enrollment_helpers.js

lms/djangoapps/support/static/support/js/views/enrollment.js

...oapps/support/static/support/js/views/enrollment_modal.js

...port/static/support/templates/enrollment-modal.underscore

...ps/support/static/support/templates/enrollment.underscore