BUG-17533: Migrate HCatalog APIs to new namespace