Allow cassandra to compile under java 8, resynced for 2.1

patch by dbrosius reviewed by jmckenzie for cassandra-7028