slack-19.0: backport vitessio/vitess#16926#663

timvaillancourt wants to merge 1 commit intoslack-19.0slackhq/vitess:slack-19.0from

bp-pr16926.slack-19.0slackhq/vitess:bp-pr16926.slack-19.0Copy head branch name to clipboard