Update Cassandra to 1.2.3 (and fix JAVA-48)