Merge branch '2.18' into 2.19

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/dataformat/xml/failing/ConflictingGetters27Test.java

@@ -6,8 +6,10 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 
+// For [dataformat-xml#27]
 public class ConflictingGetters27Test extends XmlTestBase
 {
+    // [dataformat-xml#27]
     @JsonRootName("output")
     static class Bean {
         public BeanInfo[] beanInfo;
@@ -42,10 +44,11 @@ public BeanInfo() { }
 
     /*
     /**********************************************************************
-    /* Unit tests
+    /* Test methods
     /**********************************************************************
      */
 
+    // [dataformat-xml#27]
     public void testIssue27() throws Exception
     {
         XmlMapper mapper = new XmlMapper();