chore: add changes from openedx/master #671

Job	Run time
collect-and-verify (3.8, 3.2)	3m 0s
gh-hosted-python-3.8,django-3.2,lms-1	10m 20s
gh-hosted-python-3.8,django-3.2,lms-2	6m 35s
gh-hosted-python-3.8,django-3.2,lms-3	14m 10s
gh-hosted-python-3.8,django-3.2,lms-4	14m 57s
gh-hosted-python-3.8,django-3.2,lms-5	7m 55s
gh-hosted-python-3.8,django-3.2,lms-6	12m 37s
gh-hosted-python-3.8,django-3.2,openedx-1	11m 20s
gh-hosted-python-3.8,django-3.2,openedx-2	11m 17s
gh-hosted-python-3.8,django-3.2,openedx-3	7m 11s
gh-hosted-python-3.8,django-3.2,openedx-4	3m 35s
gh-hosted-python-3.8,django-3.2,cms-1	2m 45s
gh-hosted-python-3.8,django-3.2,cms-2	14m 51s
gh-hosted-python-3.8,django-3.2,common-1	7m 43s
gh-hosted-python-3.8,django-3.2,common-2	3m 51s
gh-hosted-python-3.8,django-3.2,xmodule-1	8m 39s
	2h 20m 46s

Provide feedback