update versioning for 2.1.0-rc4 release
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
Merge branch 'cassandra-2.1' into trunk
Fix ReversedType(DateType) mapping to native protocol

patch by Ben Hood; reviewed by Aleksey Yeschenko for CASSANDRA-7576
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
Merge remote-tracking branch 'origin/trunk' into 7395
Merge branch '7395' into 7562-udf-java