HUE-897 Small fixes on Beeswax and Metastore