Removed cohort_config from advanced settings page.

TNL-1258

cms/djangoapps/models/settings/course_metadata.py

@@ -18,6 +18,7 @@ class CourseMetadata(object):
     # Should not be used directly. Instead the filtered_list method should
     # be used if the field needs to be filtered depending on the feature flag.
     FILTERED_LIST = [
+        'cohort_config',
         'xml_attributes',
         'start',
         'end',

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

@@ -154,7 +154,6 @@ class AdvancedSettingsPage(CoursePage):
             'cert_name_long',
             'cert_name_short',
             'certificates_display_behavior',
-            'cohort_config',
             'course_image',
             'cosmetic_display_price',
             'advertised_start',

lms/djangoapps/django_comment_client/utils.py

@@ -405,7 +405,7 @@ def add_courseware_context(content_list, course, user, id_map=None):
             content.update({"courseware_url": url, "courseware_title": title})
 
 
-def prepare_content(content, course_key, is_staff=False, **kwargs):
+def prepare_content(content, course_key, is_staff=False, course_is_cohorted=None):
     """
     This function is used to pre-process thread and comment models in various
     ways before adding them to the HTTP response.  This includes fixing empty
@@ -459,7 +459,6 @@ def prepare_content(content, course_key, is_staff=False, **kwargs):
         else:
             del endorsement["user_id"]
 
-    course_is_cohorted = kwargs.get('course_is_cohorted')
     if course_is_cohorted is None:
         course_is_cohorted = is_course_cohorted(course_key)