Merge branch 'hbase12-support'
HBase 1.2 support