HBASE-12607 Addendum fixes compilation