Merge branch stable-2.12 into HEAD

* stable-2.12:
  Add sha1 for the Gerrit plugin api dependency
  Fix stable-2.12 build and tests

Change-Id: I89d4ae72bb09a0bcb1ff8a7bd3341521b3f6fff9