CA-101175: Replace Event.next by Event.from

Signed-off-by: Vincent Bernardoff <vincent.bernardoff@citrix.com>
CA-101175: Event.from timeout now 30 seconds, only watch for the specific tasks

Signed-off-by: Vincent Bernardoff <vincent.bernardoff@citrix.com>
Merge pull request #1237 from vbmithr/CA-101175-for-clearwater

CLEARWATER: CA-101175: Replace Event.next by Event.from