diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
index 97e0e4e203..be7180e37c 100644
--- a/requirements/common_constraints.txt
+++ b/requirements/common_constraints.txt
@@ -3,6 +3,11 @@
 # See BOM-2721 for more details.
 # Below is the copied and edited version of common_constraints
 
+# This is a temporary solution to override the real common_constraints.txt
+# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
+# See BOM-2721 for more details.
+# Below is the copied and edited version of common_constraints
+
 # A central location for most common version constraints
 # (across edx repos) for pip-installation.
 #
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 9c4d473ceb..0c7ba266bd 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -25,7 +25,7 @@ django-storages<1.9
 # The team that owns this package will manually bump this package rather than having it pulled in automatically.
 # This is to allow them to better control its deployment and to do it in a process that works better
 # for them.
-edx-enterprise==3.58.16
+edx-enterprise==3.58.17
 
 # oauthlib>3.0.1 causes test failures ( also remove the django-oauth-toolkit constraint when this is fixed )
 oauthlib==3.0.1
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 2a8e2c22ad..7e5d2f6c83 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -478,7 +478,7 @@ edx-drf-extensions==8.3.1
     #   edx-when
     #   edxval
     #   learner-pathway-progress
-edx-enterprise==3.58.16
+edx-enterprise==3.58.17
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.in
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 6b09651053..5a7555dfd5 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -598,7 +598,7 @@ edx-drf-extensions==8.3.1
     #   edx-when
     #   edxval
     #   learner-pathway-progress
-edx-enterprise==3.58.16
+edx-enterprise==3.58.17
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/testing.txt
@@ -975,6 +975,10 @@ mysqlclient==2.1.1
     # via
     #   -r requirements/edx/testing.txt
     #   blockstore
+networkx==2.8.8
+    # via
+    #   -r requirements/edx/testing.txt
+    #   grimp
 newrelic==8.4.0
     # via
     #   -r requirements/edx/testing.txt
diff --git a/requirements/edx/pip.txt b/requirements/edx/pip.txt
index bcce651bbe..5251582d38 100644
--- a/requirements/edx/pip.txt
+++ b/requirements/edx/pip.txt
@@ -4,6 +4,10 @@
 #
 #    make upgrade
 #
+--index-url http://edx.devstack.devpi:3141/root/pypi/+simple/
+--extra-index-url https://pypi.python.org/simple
+--trusted-host edx.devstack.devpi
+
 wheel==0.38.4
     # via -r requirements/edx/pip.in
 
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 50c0373468..86d8d244f8 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -577,7 +577,7 @@ edx-drf-extensions==8.3.1
     #   edx-when
     #   edxval
     #   learner-pathway-progress
-edx-enterprise==3.58.16
+edx-enterprise==3.58.17
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
@@ -922,6 +922,8 @@ mysqlclient==2.1.1
     # via
     #   -r requirements/edx/base.txt
     #   blockstore
+networkx==2.8.8
+    # via grimp
 newrelic==8.4.0
     # via
     #   -r requirements/edx/base.txt