Merge branch 'stable-2.10' into stable-2.11

* stable-2.10:
  Upgrade JGit to 4.5.5.201812240535-r

Change-Id: Ie7d0263ced0db87079bb4ed061febc4b866a6e22