Merge branch '2.19' into 2.x

Author: cowtowncoder

datatypes/src/test/java/com/fasterxml/jackson/datatype/jdk8/OptionalTest.java

@@ -284,12 +284,10 @@ public void testTypeResolution() throws Exception
     }
 
     // [modules-java8#372]
-    public void testIssue372() throws Exception
+    public void testIssue372Deser() throws Exception
     {
         JsonNode input = MAPPER.getNodeFactory().textNode("abc");
-        //JavaType type = MAPPER.getTypeFactory().constructType(Optional.class);
         JavaType type = TypeFactory.defaultInstance().constructType(Optional.class);
-        //JavaType type = MAPPER.constructType(Optional.class);
         Optional<?> value = MAPPER.readValue(MAPPER.treeAsTokens(input), type);
         assertEquals(Optional.of("abc"), value);
     }