Many Repo Fixes

What does this MR do?

EE MR, https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2679

Fixes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37134801

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

Why was this MR needed?

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

• Tests
  • Added for this feature/bug
  • All builds are passing
• Review
  • Has been reviewed by Frontend
• Conform by the merge request performance guides
• Conform by the style guides
• Branch has no merge conflicts with master (if it does - rebase it please)
• Squashed related commits together

What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37134801