Merge branch '2.18'

Author: cowtowncoder

ion/src/main/java/tools/jackson/dataformat/ion/IonObjectMapper.java

@@ -159,7 +159,7 @@ protected Object readResolve() {
 
     /*
     /**********************************************************************
-    /* Life-cycle
+    /* Life-cycle, constructors
     /**********************************************************************
      */
 
@@ -175,6 +175,12 @@ public IonObjectMapper(Builder b) {
         super(b);
     }
 
+    /*
+    /**********************************************************************
+    /* Life-cycle, builders
+    /**********************************************************************
+     */
+
     /**
      * A builder for a mapper that will use textual writers by default. Same as
      * {@link #builderForTextualWriters()}.