OOZIE-1604 <java-opts> and <java-opt> not added to Application Master property in uber mode (ryota)

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