Merge pull request #426 from edx-solutions/ekolpakov/dependency_updates

Switched to rebased XBlock version + restored some xblock dependencies. 

common/lib/xblock/discussion/discussion_forum/discussion_forum.py

 import logging
 
 from xblock.core import XBlock
-from xblock.fields import Scope, String
+from xblock.fields import Scope, String, UNIQUE_ID
 from xblock.fragment import Fragment
 
-from uuid import uuid4
 
 from .utils import (
     render_template,
@@ -21,7 +20,7 @@ class DiscussionXBlock(XBlock):
     """ Provides functionality similar to discussion XModule in inline mode """
     FIELDS_TO_INIT = ('discussion_id',)
 
-    discussion_id = String(scope=Scope.settings, default=lambda: uuid4().hex)
+    discussion_id = String(scope=Scope.settings, default=UNIQUE_ID)
     display_name = String(
         display_name="Display Name",
         help="Display name for this module",

requirements/edx/custom.txt

 # Custom requirements to be customized by individual OpenEdX instances
 
--e git+https://github.com/edx/xblock-utils.git@d11b3c722bd7ffad49c54ae7080a4e57f506c5e2#egg=xblock-utils
--e git+https://github.com/edx-solutions/xblock-mentoring.git@89c8ac1d1ab3635167fca69e307b33480c01f462#egg=xblock-mentoring
+-e git+https://github.com/edx/xblock-utils.git@8193ee7eb7a94d339435fdceb57e63964d271c3d#egg=xblock-utils
+-e git+https://github.com/edx-solutions/xblock-mentoring.git@873b93d3f6e23d88f22d786629e9c5608ad07c75#egg=xblock-mentoring
 -e git+https://github.com/edx-solutions/xblock-image-explorer.git@21b9bcc4f2c7917463ab18a596161ac6c58c9c4a#egg=xblock-image-explorer
 -e git+https://github.com/edx-solutions/xblock-drag-and-drop.git@92ee2055a16899090a073e1df81e35d5293ad767#egg=xblock-drag-and-drop
 -e git+https://github.com/edx-solutions/xblock-drag-and-drop-v2.git@ed24dbef753e411f2c9b17339ae21f3a89a8531c#egg=xblock-drag-and-drop-v2
@@ -10,4 +10,4 @@
 -e git+https://github.com/edx-solutions/xblock-adventure.git@f908e087923231477499e2c455d356d286293641#egg=xblock-adventure
 -e git+https://github.com/mckinseyacademy/xblock-poll.git@ed6a2086f158a4b1a8b9219e5105d030fff5910a#egg=xblock-poll
 -e git+https://github.com/OfficeDev/xblock-officemix/@86238f5968a08db005717dbddc346808f1ed3716#egg=xblock_officemix-master
--e git+https://github.com/edx/edx-notifications.git@fa02cce7c1e158735cd54aea79623b048395841d#egg=edx-notifications
+-e git+https://github.com/edx/edx-notifications.git@1496385f16d2571bc5d958c17e30f3eac3869b8e#egg=edx-notifications

requirements/edx/github.txt

@@ -21,7 +21,7 @@
 git+https://github.com/mitocw/django-cas.git@60a5b8e5a62e63e0d5d224a87f0b489201a0c695#egg=django-cas
 
 # Our libraries:
--e git+https://github.com/edx/XBlock.git@9c634481dfc85a17dcb3351ca232d7098a38e10e#egg=XBlock
+-e git+https://github.com/edx-solutions/XBlock.git@54eb39cf8eb45c2adeb412cc784e989d8e3693e8#egg=XBlock
 -e git+https://github.com/edx/codejail.git@6b17c33a89bef0ac510926b1d7fea2748b73aadd#egg=codejail
 -e git+https://github.com/edx/js-test-tool.git@v0.1.6#egg=js_test_tool
 -e git+https://github.com/edx/event-tracking.git@0.1.0#egg=event-tracking