[Dodger] CA-130038: Backport fix for NBD connection handling