Porting 1194, 1193, 1172 to hcat-intre from trunk

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