CA-105160: Make sure that event_wait is cancellable

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
CA-105155: Make sure we really timeout as requested

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
Merge pull request #6 from jonludlam/cancellable-update

CA-105160: Make sure that event_wait is cancellable