Changed names of *_socket_klass to *_socket_class.
Changed names of *_socket_klass to *_socket_class.
Merge branch 'injectable_connection_sockets'