Fix Cassandra crash when running on JDK8 update 40

Patch by Michael Schuler; reviewed by Robert Stupp (CASSANDRA-8209)
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	build.xml