OOZIE-1333 Some testcases related to EventHandlerService are failing in a transient way (virag)

git-svn-id: https://svn.apache.org/repos/asf/oozie/trunk@1471203 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk
Merge remote branch 'origin/trunk' into trunk-gd