Backport PRs 18282 & 18791#765

twthorn wants to merge 6 commits intoslack-19.0slackhq/vitess:slack-19.0from

backport-pr-18282-18791slackhq/vitess:backport-pr-18282-18791Copy head branch name to clipboard