Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Bazel: Fix asciidoc.bzl python invocation
  Update jruby and asciidoctorj

Change-Id: Ibf1dc34ab62353cb6021d2ca505174a8706950df

tools/bzl/asciidoc.bzl

@@ -47,6 +47,7 @@ def _replace_macros_impl(ctx):
     inputs = [ctx.file._exe, ctx.file.src],
     outputs = [ctx.outputs.out],
     command = cmd,
+    use_default_shell_env = True,
     progress_message = "Replacing macros in %s" % ctx.file.src.short_path,
   )