Fix some failing specs on master

Nick Thomas requested to merge nick.thomas/gitlab-ee:2694-fix-specs into master

What does this MR do?

Fix some specs broken by the combination of merging !2140 (merged) and !2137 (merged) into master

Are there points in the code the reviewer needs to double check?

Why was this MR needed?

Failing specs on master, e.g.,

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

Closes #2694 (closed)

Edited by Nick Thomas

Merge request reports