Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade JGit to 4.11.9.201909030838-r
  Bazel: Add fixes for --incompatible_load_java_rules_from_bzl

Change-Id: Ibf68925f552e338c5aec67dcee5662a5699458e0