Merge branch 'stable-3.5' into stable-3.6

* stable-3.5:
  Set Gerrit to 3.5.5

Change-Id: I2021f72e7c349da486138dec0ebc95d553c45f77
diff --git a/fpm/Makefile b/fpm/Makefile
index 515b89e..4c2d147 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -3,7 +3,7 @@
 BRANCH=stable-3.6
 URL=https://gerrit-releases.storage.googleapis.com/gerrit-$(WAR_VERSION).war
 CI_URL=https://gerrit-ci.gerritforge.com
-RELEASE=2
+RELEASE=1
 
 NAME=gerrit
 CATEGORY=Development