(EE) Prepare Repository#merge for migration to Gitaly

What does this MR do?

Cherry-picks https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14254 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14154 .

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

Why was this MR needed?

Merge conflicts.

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

• Changelog entry added, if necessary
• Documentation created/updated
• API support added
• Tests added for this feature/bug
• Review
  • Has been reviewed by UX
  • Has been reviewed by Frontend
  • Has been reviewed by Backend
  • Has been reviewed by Database
• Conform by the merge request performance guides
• Conform by the style guides
• Squashed related commits together

What are the relevant issue numbers?