CASSANDRA-911 fixed incorrect timeout calculations. Patch by Roger Schildmeijer and Kelvin Kakugawa, reviewed by Chris Goffinet.