Make the message less scary -- Related to #1074
Clear the timeout for handshake. ROTS by @wmrowan
Merge v1.7.x -- Clean handshake settimeout
Merge branch 'michel_1074_disconnect' into next
Merge branch 'next' into sam_1213