improve memory use and timeout defaults
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6059
merge from 2.0