EXP-490. Apply changes from EXP-487 (work with Cassandra) to CDH 4 branch

issue: https://jira.kiji.org/browse/EXP-490
review: https://review.kiji.org/r/2223