Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  e2e-tests: Rename 'default' after GerritSimulation core change Id33ada17
  e2e-tests: Rename 'unique' after GerritSimulation core change I229976f5
  e2e-tests: Rename 'name' after GerritSimulation core change I3527fb39
  e2e-tests: Remove unnecessary type specification

Change-Id: I324e7a7fe87818bc0a3d1d1dd424817583b6e91c