SCHEMA-695. Rebase and merge all Cassandra code onto master

issue: https://jira.kiji.org/browse/SCHEMA-695
review: https://review.kiji.org/r/1963