Revert generic timeout increase and target to the specific test instead

patch by Berenguer Blasi; reviewed by Benjamin Lerer for CASSANDRA-16073
diff --git a/cql_tracing_test.py b/cql_tracing_test.py
index cb3805a..869760b 100644
--- a/cql_tracing_test.py
+++ b/cql_tracing_test.py
@@ -27,6 +27,8 @@
         jvm_args.append('-Dcassandra.wait_for_tracing_events_timeout_secs=15')
 
         cluster = self.cluster
+        cluster.set_configuration_options(values={'write_request_timeout_in_ms': 30000,
+                                          'read_request_timeout_in_ms': 30000})
 
         if random_partitioner:
             cluster.set_partitioner("org.apache.cassandra.dht.RandomPartitioner")
diff --git a/dtest_setup.py b/dtest_setup.py
index e9bb74a..5688604 100644
--- a/dtest_setup.py
+++ b/dtest_setup.py
@@ -399,7 +399,7 @@
         else:
             repaired_data_tracking_values = {}
 
-        timeout = 30000
+        timeout = 15000
         if self.cluster_options is not None and len(self.cluster_options) > 0:
             values = merge_dicts(self.cluster_options, phi_values, repaired_data_tracking_values)
         else: