Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Update JGit to acf21c0bc

Release-Notes: skip
Change-Id: I169d7c1ded2db55c678b2512577ae39a088bd569