Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Allow dash in name of junit_tests rule

Change-Id: I5f48c6076bd68654065a85ba0e0c0ab685e39b54

tools/bzl/junit.bzl

diff --git a/tools/bzl/junit.bzl b/tools/bzl/junit.bzl
index 1246669..8ab635c 100644
--- a/tools/bzl/junit.bzl
+++ b/tools/bzl/junit.bzl
@@ -73,7 +73,7 @@
 ]
 
 def junit_tests(name, srcs, **kwargs):
-    s_name = name + "TestSuite"
+    s_name = name.replace("-", "_") + "TestSuite"
     _GenSuite(
         name = s_name,
         srcs = srcs,