Merge branch '2.1.x'

Author: snicoll

.bomr/bomr.yaml

@@ -16,6 +16,10 @@ bomr:
         versions:
           # 10.15 requires Java 9
           - '[10.15,)'
+      - project: netty
+        versions:
+          # https://github.com/reactor/reactor-netty/issues/844
+          - '[4.1.40.Final,)'
   verify:
     ignored-dependencies:
       # Avoid conflicting transitive requirements for