Fix for HBASE-10139

This is my fix for HBASE-10139 and it's running fine in my cluster.