Add support for doing a new handshake.
This is to get a new challengeToken without closing
the connection.
Merge branch 'dev'