Copy changes

Conflicts:
	lms/djangoapps/verify_student/views.py