Apache Cassandra 3.0.4 release
Merge branch 'cassandra-2.2' into cassandra-3.0