diff --git a/LICENSE b/LICENSE
index 46f4f252464..6acfaf43962 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,8 @@
 This program and the accompanying materials are made available under the
-terms of the Eclipse Public License 2.0 which is available at
-http://www.eclipse.org/legal/epl-2.0, or the Apache Software License
-2.0 which is available at https://www.apache.org/licenses/LICENSE-2.0.
+terms of the Eclipse Public License 1.0 which is available at
+https://www.eclipse.org/org/documents/epl-1.0/EPL-1.0.txt
+or the Apache Software License 2.0 which is available at
+https://www.apache.org/licenses/LICENSE-2.0
 
 
 
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/DefaultHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/DefaultHandlerTest.java
index 835aa0321ee..c0690b50859 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/DefaultHandlerTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/DefaultHandlerTest.java
@@ -89,9 +89,9 @@ public class DefaultHandlerTest
             HttpTester.Response response = HttpTester.parseResponse(input);
 
             assertEquals(HttpStatus.NOT_FOUND_404, response.getStatus());
-            assertEquals("text/html;charset=ISO-8859-1", response.get(HttpHeader.CONTENT_TYPE));
+            assertEquals("text/html;charset=UTF-8", response.get(HttpHeader.CONTENT_TYPE));
 
-            String content = new String(response.getContentBytes(),StandardCharsets.ISO_8859_1);
+            String content = new String(response.getContentBytes(),StandardCharsets.UTF_8);
             assertThat(content,containsString("Contexts known to this server are:"));
             assertThat(content,containsString("/foo"));
             assertThat(content,containsString("/bar"));
diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreTest.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreTest.java
index 245eaa0d32d..56696a5df11 100644
--- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreTest.java
+++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreTest.java
@@ -116,6 +116,16 @@ 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.
+    }
+
     /**
      * 
      * This test deliberately sets the sessionDataMap to null for the