Merge branch 'stable'

* stable:
  Gerrit 2.1.2.5
  Update to JGit 0.7.1.74-g16419da