Merge socketserver fixes from 3.5 into 3.6