fixed problems with timing of HA creation and syntax errors in hive/hcatalog
Merge request #4 - resolved conflicts