cqlsh: preserve original result column names

Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7806
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	bin/cqlsh
ninja fix cassandra.yaml missing memtable_(off)?heap_size_in_mb
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Correctly remove tmplink files

Patch by marcuse; reviewed by benedict for CASSANDRA-7803
Merge branch 'cassandra-2.1.0' into cassandra-2.1
cqlsh: Fix handling of CAS statement results

Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7671
Use python driver for UDTs in DESCRIBE output

Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7659
Don't send schema change msg for no-op DDL stmts

Patch by Tyler Hobbs; review by Mikhail Stepura for CASSANDRA-7600
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1
cqlsh: allow COPY FROM to be interrupted with ctrl-c

Patch by Tyler Hobbs; review by Mikhail Stepura for CASSANDRA-7815
(cqlsh) Display the current logged-in user

patch by Aaron Ploetz; reviewed by Mikhail Stepura for CASSANDRA-7785
Improve error message from 7499
Update java driver to 2.0.5 (for hadoop)
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	build.xml
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
Merge branch 'cassandra-2.1' of https://github.com/apache/cassandra into 7523_211
fleshed out NanoTime, added NanoTimeTest