Merge branch '2.1.x'

Closes gh-17369

.bomr/bomr.yaml

@@ -18,7 +18,7 @@ bomr:
           - '[10.15,)'
   verify:
     ignored-dependencies:
-      # Avoid confliciting transitive requirements for
+      # Avoid conflicting transitive requirements for
       # io.grpc:grpc-core:jar:[1.0.1,1.0.1] (Jetty),
       # io.grpc:grpc-core:jar:[1.14.0,1.14.0] (Micrometer's Azure Registry), and
       # io.grpc:grpc-core:jar:[1.15.0,1.15.0] (Micrometer's Stackdriver Registry)