Fix compilation with java 6 (JAVA-7147 regression)
Changelog
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/utils/ByteBufferUtil.java
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk