Fix 8.15 RC1 requires quite amount of downtime

See https://gitlab.com/gitlab-org/gitlab-ce/issues/25635

See merge request !8106