Merge branch 'stable-3.11'

* stable-3.11:
  Set Gerrit to 3.11.5
  Set Gerrit to 3.10.8

Change-Id: Ie73edcff58012160779b555c562f8042d839b683