Update code to work with the latest versions of hbase and zookeeper