Merge branch '2.9' into 2.10

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -212,7 +212,7 @@ Project: jackson-databind
 #2670: Block one more gadget type (openjpa, CVE-2020-11113)
  (reported by XuYuanzhen)
 #2680: Block one more gadget type (SSRF, spring-aop, CVE-2020-11619)
-#2680: Block one more gadget type (commons-jelly, CVE-2020-11620)
+#2682: Block one more gadget type (commons-jelly, CVE-2020-11620)
 
 2.9.10.3 (23-Feb-2020)