Supersedes #34573

Comment From: wilkinsona

There's an (accidental?) change in Flyway that causes it to retry database connections 120 times with no wait interval. Until that has been addressed, I think we should stick on 9.15.