Merge "[barbican] Retry on tls connection timeout" into mcp/caracal