Merge branch 'stable-3.0'

* stable-3.0:
  Revert "Add PolyGerrit UI for configuring uploadvalidator"

Change-Id: Ifa2c1502e2a5e3160b79fd830f3372e016b065b9