Pull in improved timeout handling in the cassandra driver

Change-Id: I184a19994cc87529aba8f8254d5f7e8f02af90c0