Merge branch stable-2.16

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

Change-Id: I9b420bd83a6ee77d3a70cf6e1504ea3a9920b8e0