OOZIE-1207 Optimize current EL resolution in case of start-instance and end-instance (rohini via mona)

git-svn-id: https://svn.apache.org/repos/asf/oozie/trunk@1453057 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-1250 Coord action timeout not happening when there is a exception (rohini via mona)

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