Fix TimeoutException when there is a firewall issue.
patch by Vijay; reviewed by jbellis for CASSANDRA-3533
Ensure that PerRowSecondaryIndex updates see the most recentvalues
patch by Sam Tunnicliffe; reviewed by jbellis for CASSANDRA-5397
merge from 1.2
r/m unused methods