HBase-12023 addendum patch - too many iterator objects