Fix failing cqlsh formatting tests

Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7703
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	pylib/cqlshlib/test/test_cqlsh_output.py
	pylib/cqlshlib/test/test_keyspace_init.cql
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Clone token map outside of hot gossip loops
patch by rbranson; reviewed by jbellis for CASSANDRA-7758
merge from 1.2
merge from 2.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
merge from 2.1
build.xml - exclude *.ps1 from fixcrlf

Patch by Robert Stupp; review by Joshua McKenzie for CASSANDRA-7690
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Merge remote-tracking branch 'origin/trunk' into 7563