Hbase fixes

This pull request contains fixes for DRILL-483, DRILL-484, and DRILL-486