Merge branch stable-2.12

* stable-2.12:
  Adapt to the JGit v4.5.x

Change-Id: I45ca07a7bc98d3d8acb2d8af0516a42eef90e845