Revert last two changes in this file

Otherwise testing stops with:
ailed to talk to service proposal create: 500: undefined method
`hash_only_merge!' for HashOnlyMerge:Module
Merge pull request #822 from dirkmueller/release/roxy/master

+1
Refactor the remote_node module

Remove the extra 10 second sleep, which was called even before any
contact with the remote node was attempted. So if node is up, the
response is immediate.

Also make sure that the TCPSocket is closed after check,
preventing the leak of file descriptors.