Merge branch 'stable-2.15'

* stable-2.15:
  Add optional dir_name argument to gerrit_plugin
  Format WORKSPACE and BUILD files with buildifier version 0.12.0
  Move commons-io from lib/BUILD to lib/commons/BUILD

Change-Id: I63bf9cec7e81f3f0f7ef88addf99e544bc1d7479

Documentation/dev-contributing.txt

diff --git a/Documentation/dev-contributing.txt b/Documentation/dev-contributing.txt
index 8acd663..e065e57 100644
--- a/Documentation/dev-contributing.txt
+++ b/Documentation/dev-contributing.txt
@@ -166,7 +166,7 @@
 link:https://github.com/google/google-java-format[`google-java-format`]
 tool (version 1.5), and to format Bazel BUILD and WORKSPACE files the
 link:https://github.com/bazelbuild/buildtools/tree/master/buildifier[`buildifier`]
-tool (version 0.11.1).
+tool (version 0.12.0).
 These tools automatically apply format according to the style guides; this
 streamlines code review by reducing the need for time-consuming, tedious,
 and contentious discussions about trivial issues like whitespace.

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index bc21d01..78dda21 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,7 +1,7 @@
 workspace(name = "gerrit")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
-load("//tools/bzl:maven_jar.bzl", "maven_jar", "GERRIT", "MAVEN_LOCAL")
+load("//tools/bzl:maven_jar.bzl", "GERRIT", "MAVEN_LOCAL", "maven_jar")
 load("//lib/codemirror:cm.bzl", "CM_VERSION", "DIFF_MATCH_PATCH_VERSION")
 load("//plugins:external_plugin_deps.bzl", "external_plugin_deps")
 
@@ -220,7 +220,7 @@
     sha1 = "8c3492f7662fa1cbf8ca76a0f5eb1146f7725acd",
 )
 
-load("//lib:guava.bzl", "GUAVA_VERSION", "GUAVA_BIN_SHA1")
+load("//lib:guava.bzl", "GUAVA_BIN_SHA1", "GUAVA_VERSION")
 
 maven_jar(
     name = "guava",
@@ -946,7 +946,7 @@
     sha1 = "65bd0cacc9c79a21c6ed8e9f588577cd3c2f85b9",
 )
 
-load("//tools/bzl:js.bzl", "npm_binary", "bower_archive")
+load("//tools/bzl:js.bzl", "bower_archive", "npm_binary")
 
 npm_binary(
     name = "bower",

gerrit-gwtui/BUILD

diff --git a/gerrit-gwtui/BUILD b/gerrit-gwtui/BUILD
index 56ac0ea..1a772f1 100644
--- a/gerrit-gwtui/BUILD
+++ b/gerrit-gwtui/BUILD
@@ -1,7 +1,7 @@
 load(
     "//tools/bzl:gwt.bzl",
-    "gwt_genrule",
     "gen_ui_module",
+    "gwt_genrule",
     "gwt_user_agent_permutations",
 )
 load("//tools/bzl:license.bzl", "license_test")

plugins/replication

diff --git a/plugins/replication b/plugins/replication
index aaff48d..3a47f8c 160000
--- a/plugins/replication
+++ b/plugins/replication
@@ -1 +1 @@
-Subproject commit aaff48d82be18d99f50feab6d869cb9c98874f29
+Subproject commit 3a47f8c11ebdbcbc65fc6a58c35d18f1f3c3a74b