Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Remove the + operator on dicts from .bzl files

Change-Id: I6353f413948312700cc4bde35de9009ca17c1cff

tools/bzl/asciidoc.bzl

@@ -137,9 +137,9 @@ _asciidoc_attrs = {
 }
 
 _asciidoc = rule(
-    attrs = _asciidoc_attrs + {
+    attrs = dict(_asciidoc_attrs.items() + {
         "outs": attr.output_list(mandatory = True),
-    },
+    }.items()),
     implementation = _asciidoc_impl,
 )
 

tools/bzl/js.bzl

@@ -173,10 +173,10 @@ def _js_component(ctx):
 
 js_component = rule(
     _js_component,
-    attrs = _common_attrs + {
+    attrs = dict(_common_attrs.items() + {
         "srcs": attr.label_list(allow_files = [".js"]),
         "license": attr.label(allow_single_file = True),
-    },
+    }.items()),
     outputs = {
         "zip": "%{name}.zip",
     },
@@ -184,14 +184,14 @@ js_component = rule(
 
 _bower_component = rule(
     _bower_component_impl,
-    attrs = _common_attrs + {
+    attrs = dict(_common_attrs.items() + {
         "zipfile": attr.label(allow_single_file = [".zip"]),
         "license": attr.label(allow_single_file = True),
         "version_json": attr.label(allow_files = [".json"]),
 
         # If set, define by hand, and don't regenerate this entry in bower2bazel.
         "seed": attr.bool(default = False),
-    },
+    }.items()),
 )
 
 # TODO(hanwen): make license mandatory.