HBASE-9328 and HBASE-9504 ready to go

[Jean-Marc Spaggiari]

Hi team,

HBASE-9328 is ready for trunk and 0.94
HBASE-9504 is ready for 0.94

Looking for someone to review and commit them.

Thanks,

JM