Merge branch 'stable-3.5'

* stable-3.5:
  Set Gerrit to 3.5.2
  Set Gerrit to 3.4.5

Change-Id: I4a77e8529848592a5c79b7d6df25b2d356fb4f42
diff --git a/fpm/Makefile b/fpm/Makefile
index 8635ad9..79994c8 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -26,7 +26,7 @@
   plugin-out-of-the-box-bazel-master-$(BRANCH)/lastSuccessfulBuild/artifact/bazel-bin/plugins/out-of-the-box/out-of-the-box.jar
 PLUGINS_JOBS= \
   plugin-avatars-gravatar-bazel-master-$(BRANCH)/lastSuccessfulBuild/artifact/bazel-bin/plugins/avatars-gravatar/avatars-gravatar.jar \
-  plugin-uploadvalidator-bazel-master-$(BRANCH)/lastSuccessfulBuild/artifact/bazel-bin/plugins/uploadvalidator/uploadvalidator.jar
+  plugin-uploadvalidator-bazel-$(BRANCH)/lastSuccessfulBuild/artifact/bazel-bin/plugins/uploadvalidator/uploadvalidator.jar
 
 RPM_OUT=$(OUT)/gerrit-$(VERSION)-$(RELEASE).$(BUILD_ARCH).rpm
 DEB_OUT=$(OUT)/gerrit-$(VERSION)-$(RELEASE).$(BUILD_ARCH).deb