gerrit 2.6-rc3
Merge branch 'stable-2.5' into stable-2.6

* stable-2.5:
  Bump openid4java dependency to 0.9.8

Change-Id: Ia946c4a5a81106d6158016ac336ba7c9b7247911