refactor: Upgrade to XBlock 6.0.0, which mandates OpaqueKeys#37935

kdmccormick wants to merge 3 commits intoopenedx:masteropenedx/openedx-platform:masterfrom

kdmccormick:kdmccormick/scope-id-typeskdmccormick/edx-platform:kdmccormick/scope-id-typesCopy head branch name to clipboard