Repo fixes part E

What does this MR do?

Fix review notes on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198

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

Does this MR meet the acceptance criteria?

• Tests added for this feature/bug
• Review
  • Has been reviewed by Frontend
• Conform by the merge request performance guides
• Conform by the style guides
• Squashed related commits together

What are the relevant issue numbers?

cc @jschatz1