Merge branch 'stable-3.2'

* stable-3.2:
  GerritConfig: Adapt package name to stable-3.1 branch

Change-Id: I8e447087b64b88564ba1ffeb881fe8219e635f2f