cqlsh should automatically disable tracing when selecting from system_traces

patch by Philip Thompson and Mikhail Stepura; reviewed by Mikhail Stepura for CASSANDRA-7641
Fixed the error when tracing query with cqlsh

patch by Robert Stupp; reviewed by Mikhail Stepura for CASSANDRA-7613
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	bin/cqlsh
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Validate IPv6 wildcard addresses properly

patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-7680
Merge branch 'cassandra-2.1' into trunk
Fix NPE in FileCacheService.sizeInBytes

patch by tjake; reviewed by jbellis for (CASSANDRA-7756)
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Fix sstableloader unable to connect encrypted node

patch by yukim; reviewed by krummas for CASSANDRA-7585
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/io/util/RandomAccessReader.java
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
	src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
	src/java/org/apache/cassandra/streaming/ConnectionHandler.java
	src/java/org/apache/cassandra/streaming/StreamPlan.java
	src/java/org/apache/cassandra/streaming/StreamResultFuture.java
	src/java/org/apache/cassandra/streaming/StreamSession.java
	src/java/org/apache/cassandra/tools/BulkLoader.java
	test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
Merge branch 'cassandra-2.1' into trunk