Merge branch 'sh-fix-no-downtime-upgrades-ce' into '12-1-stable-patch-10'
[12-1-stable] Re-add ignore_column for import columns See merge request gitlab-org/gitlab-foss!32977
[12-1-stable] Re-add ignore_column for import columns See merge request gitlab-org/gitlab-foss!32977