Merge branch 'stable-3.11'

* stable-3.11:
  Set Gerrit to 3.11.4
  Set Gerrit to 3.10.7
  Download uploadvalidator from the stable branch

Change-Id: I0bfe4beda1b72cc50742dc4e08ac9c70d05ed8c3

fpm/Makefile

diff --git a/fpm/Makefile b/fpm/Makefile
index ffeab92..e29efb0 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -24,7 +24,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

tarball/Makefile

diff --git a/tarball/Makefile b/tarball/Makefile
index 7fda41e..bb8c0fe 100644
--- a/tarball/Makefile
+++ b/tarball/Makefile
@@ -13,7 +13,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
 
 TAR_OUT=$(OUT)/gerrit-$(WAR_VERSION).tar.gz
 TAR_OUT_SIG=$(TAR_OUT).asc