Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Honour plugin name in URI on Gerrit replica

Change-Id: Id37a92bc244a29e52073e7f4a399fe2a9f36d1d0