Merge branch 'stable-2.10' into stable-2.11

* stable-2.10:
  Adapt to the JGit v4.0.0.201506090130-r

Change-Id: I5e32cbb3e1143eec973df81de23e8df2aa3e6a6b