OOZIE-1343 Sqoop sharelib should have hsqldb jar (rkanter)

git-svn-id: https://svn.apache.org/repos/asf/oozie/trunk@1478455 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-1335 The launcher job should use uber mode in Hadoop 2 by default (rkanter)

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