HBASE-12294 Addendum Two