OOZIE-1384 Make Uber Mode not the default (rkanter via virag)

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