BIGTOP-1117: hive-hcatalog integration has a few issues