Porting 1221 and adding a missed file

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