John's changes over cloudera-hbase cdh4-0.94.6_4.3.0 ported over
Ported Daniel's changes