HBASE-12023 addendum