HBase-11898, 12023 patches