slack-vitess-r14.0.5-dsdefense: backport vitessio/vitess#12174#87

timvaillancourt wants to merge 2 commits intoslack-vitess-r14.0.5-dsdefenseslackhq/vitess:slack-vitess-r14.0.5-dsdefensefrom

pr-12174-slack-vitess-r14.0.5-dsdefenseslackhq/vitess:pr-12174-slack-vitess-r14.0.5-dsdefenseCopy head branch name to clipboard