mattdrayer/api-update-project-fkey: Added organizations FK
mattdrayer/api-groupprofile-clean-xblockid: Migrate transitional content ids to original format
Merge pull request #299 from edx-solutions/mattdrayer/api-groupprofile-clean-xblockid

mattdrayer/api-groupprofile-clean-xblockid: Migrate transitional content...
Merge pull request #300 from edx-solutions/mattdrayer/api-update-project-fkey

mattdrayer/api-update-project-fkey: Added organizations FK
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