`slack-15.0`: backport vitessio/vitess#16154 #2470

Job	Run time
Get Previous Release - Query Serving (Queries)	33s
Run Upgrade Downgrade Test - Query Serving (Queries)	17m 26s
	17m 59s

Provide feedback