Slack vitess r12.0.5 vtctld cherrypicks#12

tanjinx merged 2 commits intoslack-vitess-r12.0.5-vtctldslackhq/vitess:slack-vitess-r12.0.5-vtctldfrom

slack-vitess-r12.0.5-vtctld-cherrypicksslackhq/vitess:slack-vitess-r12.0.5-vtctld-cherrypicksCopy head branch name to clipboard