Correcting for skipped file deletion part of OOZIE-1244

git-svn-id: https://svn.apache.org/repos/asf/oozie/trunk@1484560 13f79535-47bb-0310-9956-ffa450edef68
Correcting for skipped dir deletion part of OOZIE-1244

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