[v15] Fix some gRPC-tunneled connections#40672

rosstimothy merged 2 commits intobranch/v15gravitational/teleport:branch/v15from

bot/backport-40632-branch/v15gravitational/teleport:bot/backport-40632-branch/v15Copy head branch name to clipboard