HUE-1699 [dbquery] metastore fixes

- Include beeswax test fixes