Merge branch '2.17' into 2.18

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/ser/filter/JsonIncludeTest.java

@@ -105,6 +105,19 @@ public DefaultIntBean(int i1, Integer i2) {
         }
     }
 
+    @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+    static class NonDefaultBean4741 {
+        private String value = null;
+
+        public String getValue() {
+            return value;
+        }
+
+        public void setValue(String value) {
+            this.value = value;
+        }
+    }
+
     static class NonEmptyString {
         @JsonInclude(JsonInclude.Include.NON_EMPTY)
         public String value;
@@ -333,6 +346,15 @@ public void testIssue1351() throws Exception
                 mapper.writeValueAsString(new Issue1351NonBean(0)));
     }
 
+    // [databind#4741]
+    public void testSerialization4741() throws Exception
+    {
+        ObjectMapper mapper = new ObjectMapper();
+        NonDefaultBean4741 bean = new NonDefaultBean4741();
+        bean.setValue("");
+        assertEquals(a2q("{'value':''}"), mapper.writeValueAsString(bean));
+    }
+
     // [databind#1550]
     @Test
     public void testInclusionOfDate() throws Exception