Let exception handler do all the handshake failure logging
merge bug26313 into stable (again)
merge stable into default