Remove duplicate changelog entries
Merge branch 'cassandra-2.1.0' into cassandra-2.1
fix build
(cqlsh) Adjust cqlsh tests for CASSANDRA-6910

patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7673