Conflicts: cms/djangoapps/contentstore/features/advanced-settings.feature cms/djangoapps/contentstore/features/checklists.feature cms/djangoapps/contentstore/features/component.feature cms/djangoapps/contentstore/features/course-overview.feature cms/djangoapps/contentstore/features/course-settings.feature cms/djangoapps/contentstore/features/course-team.feature cms/djangoapps/contentstore/features/course-updates.feature cms/djangoapps/contentstore/features/courses.feature cms/djangoapps/contentstore/features/discussion-editor.feature cms/djangoapps/contentstore/features/grading.feature cms/djangoapps/contentstore/features/html-editor.feature cms/djangoapps/contentstore/features/problem-editor.feature cms/djangoapps/contentstore/features/section.feature cms/djangoapps/contentstore/features/signup.feature cms/djangoapps/contentstore/features/static-pages.feature cms/djangoapps/contentstore/features/subsection.feature cms/djangoapps/contentstore/features/textbooks.feature cms/djangoapps/contentstore/features/upload.feature cms/djangoapps/contentstore/features/video-editor.feature cms/djangoapps/contentstore/features/video.feature lms/djangoapps/courseware/features/certificates.feature lms/djangoapps/courseware/features/help.feature lms/djangoapps/courseware/features/high-level-tabs.feature lms/djangoapps/courseware/features/homepage.feature lms/djangoapps/courseware/features/login.feature lms/djangoapps/courseware/features/lti.feature lms/djangoapps/courseware/features/navigation.feature lms/djangoapps/courseware/features/problems.feature lms/djangoapps/courseware/features/registration.feature lms/djangoapps/courseware/features/signup.feature lms/djangoapps/courseware/features/video.feature lms/djangoapps/courseware/features/word_cloud.feature
