Merge branch 'stable-3.3'

* stable-3.3:
  e2e-tests: Reuse the now available numberKey from GerritSimulation

Change-Id: Iea6496c37c2cb4e2fd5630854afa91d6bd2886c4