Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Change bouncycastle urls
  ListAccess: Fix incorrect behavior when group appears twice for same rule

Change-Id: I5c5f4522d4297e3b98f880bdbdad519cf5dfb187

gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java
index 7989455..1f1275c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java
@@ -245,7 +245,7 @@
         }
         AccountGroup.UUID group = r.getGroup().getUUID();
         if (group != null) {
-          pInfo.rules.put(group.get(), info);
+          pInfo.rules.putIfAbsent(group.get(), info); // First entry for the group wins
         }
       }
       accessSectionInfo.permissions.put(p.getName(), pInfo);