backport upstream patch 12178 and 9106#48

pbibra merged 8 commits intoslack-vitess-r12.0.5slackhq/vitess:slack-vitess-r12.0.5from

pbibra-backport-healthcheck-cache-fixslackhq/vitess:pbibra-backport-healthcheck-cache-fixCopy head branch name to clipboard