Allow cassandra to compile under java 8

patch by dbrosius reviewed by jmckenzie for cassandra-7028
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	build.xml
	src/java/org/apache/cassandra/cql/Cql.g
	test/unit/org/apache/cassandra/cql3/CqlParserTest.java