Conflicts: cms/djangoapps/contentstore/management/commands/tests/test_import.py cms/djangoapps/contentstore/tests/test_import.py common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py common/lib/xmodule/xmodule/modulestore/xml_importer.py lms/djangoapps/bulk_email/tests/test_course_optout.py lms/djangoapps/bulk_email/tests/test_email.py lms/djangoapps/bulk_email/tests/test_err_handling.py lms/djangoapps/class_dashboard/tests/test_dashboard_data.py lms/djangoapps/courseware/courses.py lms/djangoapps/django_comment_client/base/views.py lms/djangoapps/instructor/tests/test_email.py lms/djangoapps/instructor/tests/test_legacy_anon_csv.py lms/djangoapps/instructor/tests/test_legacy_download_csv.py lms/djangoapps/instructor/tests/test_legacy_email.py lms/djangoapps/instructor/tests/test_legacy_enrollment.py lms/djangoapps/instructor/tests/test_legacy_forum_admin.py lms/djangoapps/instructor/tests/test_legacy_gradebook.py lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py lms/djangoapps/instructor/tests/test_legacy_reset.py lms/djangoapps/instructor/views/api.py lms/djangoapps/instructor/views/instructor_dashboard.py lms/djangoapps/instructor/views/legacy.py lms/templates/courseware/instructor_dashboard.html
