Merge branch 'stable-3.1'

* stable-3.1:
  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: I1ee60f5eb888bfcba235cd5628133ba13af2b148