Resolve CE/EE diffs in import form Closes gitlab-ee#10492 See merge request gitlab-org/gitlab-ce!28575