Fix broken master specs
My attempt to fix some broken specs in master:
https://gitlab.com/gitlab-org/gitlab-ee/builds/10086506
https://gitlab.com/gitlab-org/gitlab-ee/builds/10086509
My attempt to fix some broken specs in master:
https://gitlab.com/gitlab-org/gitlab-ee/builds/10086506
https://gitlab.com/gitlab-org/gitlab-ee/builds/10086509