Merge branch 'stable-3.3'

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

Change-Id: I52cef5f2807dfdcb0a217cd5ad6bdac111710128