Merge pull request #21512 from edx/BOM-96-2

common/djangoapps/util/file.py

common/lib/capa/capa/capa_problem.py

common/lib/capa/capa/xqueue_interface.py

common/lib/xmodule/xmodule/modulestore/tests/factories.py

lms/djangoapps/instructor/views/api.py

lms/djangoapps/instructor_task/models.py

lms/djangoapps/instructor_task/tests/test_base.py

lms/djangoapps/instructor_task/tests/test_tasks_helper.py