Merge pull request #4786 from aboudreault/inline-discusssion-cohorting

common/lib/xmodule/xmodule/course_module.py

common/lib/xmodule/xmodule/discussion_module.py

...atic/coffee/spec/discussion/discussion_spec_helper.coffee

...tic/coffee/spec/discussion/view/new_post_view_spec.coffee

...tatic/coffee/src/discussion/discussion_module_view.coffee

...n/static/coffee/src/discussion/views/new_post_view.coffee

lms/djangoapps/django_comment_client/forum/views.py

lms/templates/discussion/_discussion_module_studio.html

lms/templates/discussion/_underscore_templates.html

openedx/core/djangoapps/course_groups/cohorts.py

openedx/core/djangoapps/course_groups/tests/helpers.py

openedx/core/djangoapps/course_groups/tests/test_cohorts.py