Merge branch stable-2.11

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

Change-Id: I9bca8da402097e8f54e477113299abb96c18c773