Fix millisecond timestamps in Tracing

patch by Aleksey Yeschenko; reviewed by Sam Tunnicliffe for
CASSANDRA-8297
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/tracing/Tracing.java
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/config/CFMetaData.java
	src/java/org/apache/cassandra/tracing/TraceState.java
	src/java/org/apache/cassandra/tracing/Tracing.java
Disable SSLv3 for POODLE

patch by Jeremiah Jordan; reviewed by jasobrown for CASSANDRA-8265
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/transport/Server.java
	src/java/org/apache/cassandra/transport/SimpleClient.java
Merge branch 'cassandra-2.1' into trunk
ninja-fix nit from casandra-8265 commit (make repeated strings a constant)
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
	src/java/org/apache/cassandra/transport/Server.java
	src/java/org/apache/cassandra/transport/SimpleClient.java
Merge branch 'cassandra-2.1' into trunk
create the cache name format only once
make sure streams get closed
Fix aggregation fn on empty selection, column names

Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-8229
Fix ordering on SSTableScanner / SSTableReader close

Patch by jmckenzie; reviewed by marcuse for CASSANDRA-8019
Merge branch 'cassandra-2.1' into trunk
Fix incremental repair not remove parent session on remote

patch by yukim; reveiwed by krummas for CASSANDRA-8291
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/service/ActiveRepairService.java
Wait for all repair sessions to finish

patch by yukim; reviewed by krummas for CASSANDRA-8208
add check of the system wall clock time at startup

patch by jasobrown; reviewed by driftx for CASSANDRA-8305
Merge branch 'cassandra-2.1' into trunk
Add more logging to be able to debug what files readMeter can be null for.

Patch by marcuse; reviewed by thobbs for CASSANDRA-8238