Merge "Accept failure for spurious server<->server connections."