OOZIE-1446 SLACalcStatus not updating the last modified time correctly and duplicate DURATION_* event (virag,mona via mona)

git-svn-id: https://svn.apache.org/repos/asf/oozie/trunk@1502034 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-1447 Sqoop actions that don't launch a map reduce job fail with an IllegalArgumentException (jarcec via rkanter)

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