acu131306 disable ThriftClient server-retry timeout logic; it's not useful since our services are driven by an external failure detector
acu131306 fix specs
Merge remote-tracking branch 'origin/salmon_13_15_acu131306_thrift_client_options'

Conflicts:
	spec/db/cassandra_model_spec.rb