Support multiple versions of HBase, including 0.94 and 0.96 (modularized)
Merge branch 'master' into m2