Kill a buggy avro vestige
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk