Merge branch 'jetty-9.4.x' into jetty-10.0.x

tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreTest.java

@@ -116,15 +116,6 @@ public class HazelcastSessionDataStoreTest extends AbstractSessionDataStoreTest
         //to find zombie sessions.
     }
 
-    public void testStoreObjectAttributes() throws Exception
-    {
-        //This test will not work for hazelcast because we can't enable
-        //HazelcastSessionDataStore.setScavengeZombieSessions, as it's
-        //too difficult to get the required classes onto the embedded
-        //hazelcast instance: these classes are required  to handle
-        //the serialization/deserialization that hazelcast performs when querying
-        //to find zombie sessions.
-    }
 
     /**
      * 

tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/HazelcastSessionDataStoreTest.java

@@ -115,6 +115,17 @@ public class HazelcastSessionDataStoreTest extends AbstractSessionDataStoreTest
         //the serialization/deserialization that hazelcast performs when querying
         //to find zombie sessions.
     }
+
+    @Override
+    public void testStoreObjectAttributes() throws Exception
+    {
+        //This test will not work for hazelcast because we can't enable
+        //HazelcastSessionDataStore.setScavengeZombieSessions, as it's
+        //too difficult to get the required classes onto the embedded
+        //hazelcast instance: these classes are required  to handle
+        //the serialization/deserialization that hazelcast performs when querying
+        //to find zombie sessions.
+    }
     
     /**
      *