OOZIE-1580 EL variables don't get resolved in configurations imported from a <job-xml> (bowenzhangusa via rkanter)

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