sync trunk patches with hcat-intre branch

git-svn-id: https://svn.apache.org/repos/asf/oozie/branches/hcat-intre@1430055 13f79535-47bb-0310-9956-ffa450edef68