Merge pull request #301 from edx-solutions/master

changes from master to release
mattdrayer/api-migrate_transitional_ids: Cleaned up two additional tables
Merge pull request #302 from edx-solutions/mattdrayer/api-migrate_transitional_ids

mattdrayer/api-migrate_transitional_ids: Cleaned up two additional table...
Merge pull request #303 from edx-solutions/mattdrayer/api-migrate_transitional_ids

mattdrayer/api-migrate_transitional_ids: Cleaned up two additional table...
Using course ID regex from set

- API now use same regex as the rest of LMS
- Content regex includes the period (.) character
mentoring: Update hash
Merge branch 'release' into master
Merge pull request #304 from edx/clintonb/api-cleanup

Using course ID regex from set
image-explorer: Update hash
mattdrayer/api-migrate_transitional_ids: Cleaned up two additional tables

merged with master

changes after matts suggestions
set PROGRESS_DETACHED_CATEGORIES for prod environments
Merge pull request #308 from edx-solutions/derf/progress_detached_categories_setting

set PROGRESS_DETACHED_CATEGORIES for prod environments
Updating group project xblock hash
Merge pull request #293 from edx-solutions/ziafazal/api-move-cmc-to-progress

moved cmc from api_manager to progress
Moved discussion XBlock to edx-platform
(cherry picked from commit a7c0a2a)
Copied test specs
Add topic selection to inline thread editing, fixing errors

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
Backported edx-platform hosted discussion XBlock to edx-solutions (part 2)
Temporary fix for runtime.resources_fs error