HBASE-11647 addendum to fix compile issues.