Merge branch '1.9.x' into 1.10.x

Author: jonatan-ivanov

benchmarks/benchmarks-core/gradle.lockfile

@@ -112,4 +112,11 @@ subprojects {
       }
     }
   }
+  configurations.configureEach {
+    // see https://github.com/google/guava/releases/tag/v32.1.0
+    // "Reporting dependencies that overlap with Guava"
+    resolutionStrategy.capabilitiesResolution.withCapability('com.google.guava:listenablefuture') {
+        select('com.google.guava:guava:0')
+    }
+  }
 }