Configurable client timeout for cqlsh.

patch by Ryan McGuire; reviewed by Mikhail Stepura for CASSANDRA-7516
Merge branch 'cassandra-2.1' into trunk