Update from `main` (production)

[github-actions[bot]]

This is an automated pull request to update from branch main

[github-actions[bot]]

Checking git merge conflicts against https://github.com/edx/edx-platform.git

Comparing with	open-release/nutmeg.master
Benchmark conflicts with prod	292
Current conflicts	292
Summary	Good work! No added conflicts.

Comparing with	master
Benchmark conflicts with prod	299
Current conflicts	299
Summary	Good work! No added conflicts.

[bryanlandia]

Hmm, the lms-1 tox tests passed when I commented out the lms-1 tests list down to just test_tahoeusermetadata.py on devstack but when running the full suite of lms-1 tests they fail. Must be some kind of teardown condition in prior tests.

Yeah, it has to do with the UserProfileWithMetadataFactory ... we get the metadata in the wrong user's UserProfile somehow. Should be easy fix.

[github-actions[bot]]

Checking git merge conflicts against https://github.com/edx/edx-platform.git

Comparing with	open-release/nutmeg.master
Benchmark conflicts with prod	292
Current conflicts	292
Summary	Good work! No added conflicts.

Comparing with	master
Benchmark conflicts with prod	300
Current conflicts	300
Summary	Good work! No added conflicts.

[github-actions[bot]]

Checking git merge conflicts against https://github.com/edx/edx-platform.git

Comparing with	open-release/nutmeg.master
Benchmark conflicts with prod	292
Current conflicts	292
Summary	Good work! No added conflicts.

Comparing with	master
Benchmark conflicts with prod	300
Current conflicts	300
Summary	Good work! No added conflicts.

[github-actions[bot]]

Checking git merge conflicts against https://github.com/edx/edx-platform.git

Comparing with	open-release/nutmeg.master
Benchmark conflicts with prod	292
Current conflicts	292
Summary	Good work! No added conflicts.

Comparing with	master
Benchmark conflicts with prod	300
Current conflicts	300
Summary	Good work! No added conflicts.