Provide a way to override what socket is created
Merge branch 'socket-factory' into socket-wait-abstraction