Merge branch 'stable-3.4'

* stable-3.4:
  Fix broken tests
  Bump up scala to 2.11.12
  Bump Guice to v5.0.x as in Gerrit stable-3.4
  Upgrade Gerrit API to 3.3.3
  Upgrade Gerrit API to 3.3.2
  Set Gerrit API to 3.3.1-SNAPSHOT

Change-Id: I2e78a1180666d4a86ec1230b03f43aefc4b5b066