Summary:
Test failure was due to f976939f8150340dd92d82f197c06f859aa5dccd/D41420, since we now get a different error message based on the state of the cleanup.

Fixes #25745
Jira: DB-15026

Test Plan: YsqlMajorUpgradeDdlBlockingTest.TestDdlsDuringUpgrade

Reviewers: telgersma

Reviewed By: telgersma

Subscribers: sergei, ybase

Differential Revision: https://phorge.dev.yugabyte.com/D41473