Clear the timeout for handshake. ROTS by @wmrowan
Merge v1.7.x -- Clean handshake settimeout