PDI-9647 - Hbase changes