Merge pull request #9217 from edx/andya/land-teams

Enable teams and deprecate the advanced setting

common/lib/xmodule/xmodule/course_module.py

@@ -904,7 +904,8 @@ class CourseFields(object):
             "Enter configuration for the teams feature. Expects two entries: max_team_size and topics, where "
             "topics is a list of topics."
         ),
-        scope=Scope.settings
+        scope=Scope.settings,
+        deprecated=True,  # Deprecated until the teams feature is made generally available
     )
 
     enable_proctored_exams = Boolean(

common/test/acceptance/pages/studio/settings_advanced.py

@@ -199,7 +199,6 @@ class AdvancedSettingsPage(CoursePage):
             'text_customization',
             'annotation_storage_url',
             'social_sharing_url',
-            'teams_configuration',
             'video_bumper',
             'cert_html_view_enabled',
             'enable_proctored_exams',