CA-101175: Increase timeout for Event.from to 30 seconds, only watch for specific tasks

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

CA-101175: Increase timeout for Event.from to 30 seconds, only watch for...