Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Add trailing slash in default canonicalWebUrl
  Set Gerrit to 3.6.7
  Set Gerrit to 3.6.6
  Set Gerrit to 3.6.5

Change-Id: I5de6cc11031a3d57a45cf9ce6ecdf35d02bf1633

almalinux/8/entrypoint.sh

diff --git a/almalinux/8/entrypoint.sh b/almalinux/8/entrypoint.sh
index 1fc4530..30f4ef5 100755
--- a/almalinux/8/entrypoint.sh
+++ b/almalinux/8/entrypoint.sh
@@ -12,7 +12,7 @@
   git config -f /var/gerrit/etc/gerrit.config --add container.javaOptions "--add-opens java.base/java.lang.invoke=ALL-UNNAMED"
 fi
 
-git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "${CANONICAL_WEB_URL:-http://$HOSTNAME}"
+git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "${CANONICAL_WEB_URL:-http://$HOSTNAME/}"
 if [ ${HTTPD_LISTEN_URL} ];
 then
   git config -f /var/gerrit/etc/gerrit.config httpd.listenUrl ${HTTPD_LISTEN_URL}

ubuntu/20/entrypoint.sh

diff --git a/ubuntu/20/entrypoint.sh b/ubuntu/20/entrypoint.sh
index 1fc4530..30f4ef5 100755
--- a/ubuntu/20/entrypoint.sh
+++ b/ubuntu/20/entrypoint.sh
@@ -12,7 +12,7 @@
   git config -f /var/gerrit/etc/gerrit.config --add container.javaOptions "--add-opens java.base/java.lang.invoke=ALL-UNNAMED"
 fi
 
-git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "${CANONICAL_WEB_URL:-http://$HOSTNAME}"
+git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "${CANONICAL_WEB_URL:-http://$HOSTNAME/}"
 if [ ${HTTPD_LISTEN_URL} ];
 then
   git config -f /var/gerrit/etc/gerrit.config httpd.listenUrl ${HTTPD_LISTEN_URL}