DB-1498 applying patch from Apache HBASE-8143