Merge pull request #13343 from edx/douglashall/MAYN-304/site_configuration_override

Allow for site override of EDITABLE_SHORT_DESCRIPTION setting

cms/djangoapps/contentstore/views/course.py

@@ -990,7 +990,11 @@ def settings_handler(request, course_key_string):
 
             about_page_editable = not marketing_site_enabled
             enrollment_end_editable = GlobalStaff().has_user(request.user) or not marketing_site_enabled
-            short_description_editable = settings.FEATURES.get('EDITABLE_SHORT_DESCRIPTION', True)
+            short_description_editable = configuration_helpers.get_value_for_org(
+                course_module.location.org,
+                'EDITABLE_SHORT_DESCRIPTION',
+                settings.FEATURES.get('EDITABLE_SHORT_DESCRIPTION', True)
+            )
             self_paced_enabled = SelfPacedConfiguration.current().enabled
 
             settings_context = {