Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I4766254307f2f7840702e03036195652050746ff