Merge branch 'cassandra-2.1' into trunk
imports cleanup
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/transport/CBUtil.java
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk