Issue #5824: Merge socketserver tests from 3.5