OOZIE-1420 OOZIE-1365 breaks the action popup in the Web UI (michalisk via rkanter)

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