Merge changes I6a5c134a,Ieeefb1ed,Ib9986ba5 into stable-2.14

* changes:
  ConfigurationTest: Replace unnecessary member with local variable
  RateLimitUploadPackIT: Remove unnecessary method parameter list
  RateLimitUploadPackIT: Make private methods access explicit
diff --git a/src/main/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimiter.java b/src/main/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimiter.java
index 81280ba..7c695de 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimiter.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimiter.java
@@ -18,12 +18,10 @@
 import java.util.concurrent.TimeUnit;
 
 interface RateLimiter extends Comparable<RateLimiter> {
-  Comparator<RateLimiter> REVERSE_ORDER_COMPARATOR =
-      Comparator.comparing(RateLimiter::availablePermits).reversed();
 
   @Override
   public default int compareTo(RateLimiter other) {
-    return REVERSE_ORDER_COMPARATOR.compare(this, other);
+    return Comparator.comparing(RateLimiter::availablePermits).reversed().compare(this, other);
   }
 
   /** Returns number of permits allowed per hour. */