resolve merge conflicts

common/djangoapps/util/testing.py

lms/djangoapps/instructor/views/api.py

lms/djangoapps/instructor/views/gradebook_api.py

lms/djangoapps/teams/tests/test_views.py

...tions/0002_auto__add_field_programsapiconfig_cache_ttl.py

...s/programs/migrations/0002_programsapiconfig_cache_ttl.py

openedx/core/djangoapps/programs/models.py

...edx/core/djangoapps/user_api/accounts/tests/test_views.py

requirements/edx/github.txt