Merge branch 'stable-3.2' * stable-3.2: e2e-test: Rename 'default' after GerritSimulation core change Id33ada17 e2e-test: Rename 'unique' after GerritSimulation core change I229976f5 e2e-test: Rename 'name' after GerritSimulation core change I3527fb39 Change-Id: I19957884be655135d888733de3c41695f4ce7be6