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
update versioning for 2.1.0-rc4 release
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
Catch errors when the JVM pulls the rug out from GCInspector
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-5345
merge from 2.0
Merge branch 'cassandra-2.1' into trunk
Fix jvm version detection when JAVA_TOOL_OPTIONS in environment

Patch by Gregory Ramsperger, reviewed by brandonwilliams for
CASSANDRA-7572
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
no need to enforce case, when using equalsIgnoreCase
remove unbound method template parm
Give read access to system.schema_usertypes to all authenticated users

patch by Mike Adamson; reviewed by Aleksey Yeschenko for CASSANDRA-7578