Merge branch 'stable-3.1'

* stable-3.1:
  Set Gerrit to 3.1.7
  Set Gerrit to 3.0.11

Change-Id: I41c97afc37cc698b445a4d1948ae0786e5f0d00b