reduced timeout for keepalives
Fixed delayed sendMessage when waiting for connection.

Jira issue: wp-1330
Merge pull request #55 from TobyEalden/wp-1330-pr

Fixed delayed sendMessage when waiting for connection.
Merge remote-tracking branch 'upstream/master'