OOZIE-1320 Tests for sharelib actions fail with ClassNotFoundException against Hadoop 2 (rkanter)

git-svn-id: https://svn.apache.org/repos/asf/oozie/trunk@1467361 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-1292 OOZIE-1317 (mona)

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