HBASE-12559 Addendum fixes findbugs warnings