diff --git a/common.json b/common.json
index eed1172a..074ef663 100644
--- a/common.json
+++ b/common.json
@@ -26,12 +26,18 @@
       "windows-jdk17":      { "packages" : { "devkit:VS2019-16.9.3+1"  : "==0" }}
   },
   "deps": {
+    "COMMENT.common": [
+      "pip:isort is a dependency of pip:pylint. The explicit dependency on the pip package works around",
+      "https://bugzilla.redhat.com/show_bug.cgi?id=1710221 on older Redhat-based systems, and doesn't",
+      "hurt on others."
+    ],
     "common": {
       "timelimit": "30:00",
       "environment": {
         "MX_PYTHON": "python3"
       },
       "packages": {
+        "pip:isort": "==4.3.19",
         "pip:logilab-common": "==1.4.4",
         "pip:pylint": "==1.9.3",
         "pip:ninja_syntax": "==1.7.2"
diff --git a/mx.py b/mx.py
index 059aa142..7ca76e42 100755
--- a/mx.py
+++ b/mx.py
@@ -17707,7 +17707,7 @@ def alarm_handler(signum, frame):
 
 
 # The version must be updated for every PR (checked in CI)
-version = VersionSpec("5.309.6")  # arr.copy() not supported
+version = VersionSpec("5.310.0")  # GR-33817
 
 currentUmask = None
 _mx_start_datetime = datetime.utcnow()
diff --git a/mx_jardistribution.py b/mx_jardistribution.py
index f4f97ae4..1125dedd 100755
--- a/mx_jardistribution.py
+++ b/mx_jardistribution.py
@@ -428,11 +428,7 @@ def _create_derived_file(base_file, suffix, lines):
             versions = {}
             for info in in_zf.infolist():
                 if not info.filename.startswith('META-INF/versions/'):
-                    if info.filename.startswith('META-INF/services/') and jdk9_or_later and self.get_declaring_module_name():
-                        # Omit JDK 8 style service descriptors when flattening for a 9+ module
-                        pass
-                    else:
-                        flattened_entries[info.filename] = (info, in_zf.read(info))
+                    flattened_entries[info.filename] = (info, in_zf.read(info))
 
             for info in in_zf.infolist():
                 if info.filename.startswith('META-INF/versions/'):