Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Fix the junit test tag

Change-Id: Idc4c07fba8786f0a0eea63c51a39063fdbe76f31

BUILD

diff --git a/BUILD b/BUILD
index 065cc7c..ce625bb 100644
--- a/BUILD
+++ b/BUILD
@@ -14,7 +14,7 @@
 junit_tests(
     name = "singleusergroup_tests",
     srcs = glob(["src/test/java/**/*Test.java"]),
-    tags = ["replication"],
+    tags = ["singleusergroup"],
     visibility = ["//visibility:public"],
     runtime_deps = [":singleusergroup__plugin"],
     deps = PLUGIN_TEST_DEPS + PLUGIN_DEPS,