Combined patch for OOZIE-1234 and OOZIE-1235

git-svn-id: https://svn.apache.org/repos/asf/oozie/trunk@1469108 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-1332 Flakey test TestActionCheckXCommand.testActionCheckTransientDuringMRAction (rkanter)

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