add support for arbitrary -D options to .ps1 script
patch by Joshua McKenzie; reviewed by Philip Thompson for CASSANDRA-7435
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
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
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
colorize PK + clustering differently
patch by Mihai Seteu; reviewed by Robert Stupp for CASSANDRA-6910
fix build on os x
fix setlogginglevel help in nodetool
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1'
Fix word count

Patch by  Ala' Alkhaldi, reviewed by brandonwilliams for CASSANDRA-7200
Make cql3 word count executable
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Fix word count

Patch by  Ala' Alkhaldi, reviewed by brandonwilliams for CASSANDRA-7200
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Fix native protocol drop user type notification

patch by Aleksey Yeschenko; reviewed by Tyler Hobbs for CASSANDRA-7571