Merge branch 'stable-2.11' * stable-2.11: Adapt to the JGit v4.0.0.201506090130-r Change-Id: I24a13ce9aab67322b824cc1b82d65ed579776eec