Merge remote-tracking branch 'origin/release' into merge-release-into-master

Conflicts:
	cms/djangoapps/contentstore/views/course.py

cms/djangoapps/contentstore/views/course.py

@@ -1032,7 +1032,6 @@ def _refresh_course_tabs(request, course_module):
         """
         tab_panel = {
             "type": tab_type.type,
-            "name": tab_type.title,
         }
         has_tab = tab_panel in tabs
         if tab_enabled and not has_tab: