Two backport issues pending for 0.98.16

[Andrew Purtell]

Please have a look at HBASE-14611 and HBASE-14738 if you get a chance.


-- 
Best regards,

   - Andy

Problems worthy of attack prove their worth by hitting back. - Piet Hein
(via Tom White)