Merge branch 'stable-3.5'

* stable-3.5:
  RateLimiterProcessing: Adapt to older gson version

This commit is reverted.

Change-Id: I097e87d882789d7ca815539b0169a29b8773cde5

src/main/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimiterProcessing.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimiterProcessing.java b/src/main/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimiterProcessing.java
index 8e11de9..8f23613 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimiterProcessing.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimiterProcessing.java
@@ -67,7 +67,7 @@
         .sorted(Map.Entry.comparingByValue())
         .map(this::getJsonObjectString)
         .forEach(permitList::add);
-    return gson.toJson(new JsonParser().parse(permitList.toString()));
+    return gson.toJson(JsonParser.parseString(permitList.toString()));
   }
 
   private String getJsonObjectString(Map.Entry<String, RateLimiter> entry) {