Merge branch 'stable-3.5' into stable-3.9

* stable-3.5:
  test: Use existing admin account
  test: Use create-project's --empty-commit option
  test: Remove custom gerrit start script

Change-Id: If8d7d7bf6a622cc556fb70656cb6ed4b3cf2c935