HCATALOG-601 fix hcatalog dependency resolution issues

git-svn-id: https://svn.apache.org/repos/asf/incubator/hcatalog/branches/branch-0.5@1440577 13f79535-47bb-0310-9956-ffa450edef68