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
Merge branch 'cassandra-2.1' into trunk
Fix native protocol drop user type notification

patch by Aleksey Yeschenko; reviewed by Tyler Hobbs for CASSANDRA-7571
Merge branch 'cassandra-2.1' into trunk