Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Fix the junit test tag

Change-Id: I5935a14ccf61289d6c86371f894a168546a32364

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,