HCATALOG-580 Optimizations in HCAT-538 break e2e tests


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