Merge branch 'cassandra-3.0' into cassandra-3.11