Fix cqlsh authentication with 2.1 python driver

Patch by Mike Adamson; reviewed by Tyler Hobbs for CASSANDRA-7564
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Backport CASSANDRA-7454 to 2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Ninja: fix CASSANDRA-7454 placement in CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
fix setlogginglevel help in nodetool
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
colorize PK + clustering differently
patch by Mihai Seteu; reviewed by Robert Stupp for CASSANDRA-6910
Merge branch 'cassandra-2.1' into trunk
fix build on os x
Merge branch 'cassandra-2.1' into trunk
fix setlogginglevel help in nodetool
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1'
Merge branch 'trunk'