Merging hcat-intre to trunk

git-svn-id: https://svn.apache.org/repos/asf/oozie/trunk@1449911 13f79535-47bb-0310-9956-ffa450edef68