Update to get Hive and HCatalog working for hadoop1.