Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Don't auto-configure plugin for upgrades
  Use Gerrit 2.16.21 in Dockerfile
  Upgrade bazlets to latest stable-2.16

Change-Id: I908c8631403445c82eb86e1d607ad8ab3b166452