Merge branch 'stable-2.11'

* stable-2.11:
  Update plugin API version to 2.10.5 and adapt to JGit API changes

Change-Id: I8de54990ce9dab3dbed054cb8ea87d33c0965359