Revert hcatalog changes from develop

Reverting all hcat changes from develop branch to release conduit with only hdp chnages