Merge "Update from using hbase to using cassandra"