Conflicts: lms/djangoapps/instructor/tests/test_api.py lms/djangoapps/instructor/utils.py lms/djangoapps/instructor/views/api.py lms/djangoapps/instructor/views/api_urls.py lms/djangoapps/instructor/views/instructor_dashboard.py lms/djangoapps/instructor_task/api.py lms/djangoapps/instructor_task/tasks.py lms/djangoapps/instructor_task/tasks_helper.py lms/djangoapps/instructor_task/tests/test_api.py lms/djangoapps/instructor_task/tests/test_tasks.py lms/djangoapps/instructor_task/tests/test_tasks_helper.py lms/envs/aws.py lms/envs/common.py lms/static/coffee/src/instructor_dashboard/data_download.coffee lms/templates/instructor/instructor_dashboard_2/data_download.html
