Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Update jgit to 00386272264f65c41e36406f7c2e9ea6e901276e

Change-Id: I99c797c814deedaa376c0489f242c5aceb260179