Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Update JGit to 5.1.15.202012011955-r

Change-Id: I9f1dba85ca7860082254ba2437dec3bc7b170e16