Co-Authored-By: Brian Talbot <btalbot@edx.org> TNL-549 Conflicts: common/static/coffee/spec/discussion/view/discussion_thread_edit_view_spec.js common/static/coffee/src/discussion/discussion_module_view.coffee common/static/coffee/src/discussion/views/discussion_thread_edit_view.js lms/djangoapps/django_comment_client/forum/views.py
