Merge branch stable-2.10

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

Change-Id: I434b92d7fad76d87ea39bd2c2bea12bf9167d130