PHONE-18. Merge phonebook updates from PHONE-16 (Cassandra) to CDH 4 branch

issue: https://jira.kiji.org/browse/PHONE-18
review: https://review.kiji.org/r/2222