Merge branch '2.x' into 3.0

Author: cowtowncoder

yaml/src/test/java/tools/jackson/dataformat/yaml/misc/ObjectId123Test.java

@@ -10,7 +10,8 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 
-//for [dataformats-text#123], problem with YAML, Object Ids
+// for [dataformats-text#123], problem with YAML, Object Ids
+// (and also see [dataformats-text#296] for related case)
 public class ObjectId123Test extends ModuleTestBase
 {
  private final ObjectMapper MAPPER = newObjectMapper();