Sync hcat-intre with trunk patches

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