Fix conlicts for Adds migration to ensure all remote mirror columns get created when picking into 10-8-stable-patch-3

See merge request gitlab-org/gitlab-ce!19241