Merge with 3.3

Issue #14574: Ignore socket errors raised when flushing a connection on close.