[EE-Compatibiliy] Prevent merge when fast-forward is required
compatibility patch from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15296/commits
compatibility patch from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15296/commits