Merge branch 'stable-3.1'

* stable-3.1:
  CreateChangesTriggeringGc: Customize data to execute garbage collection
  e2e-tests: Reuse the now available numberKey from GerritSimulation

Change-Id: I55aa51870de3beee8008ae462e2c1dc3b3a4cd14