This is EE backport for
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/29782 and
includes some changes to specs that use methods removed in that MR.

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15138