Merge branch 'stable-3.1' into stable-3.2

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

The commit that adapted GerritConfig package name to stable-3.1 branch
was reverted.

Change-Id: Ief87265683495b637db4d8a756484d09793708a9