Simplify vtgate resolver#5679

deepthi merged 2 commits intovitessio:mastervitessio/vitess:masterfrom

planetscale:ds-simplify-resolveplanetscale/vitess:ds-simplify-resolveCopy head branch name to clipboard