fix broken merge
Merge branch 'cassandra-2.0' into trunk
more merge breakage
Merge branch 'cassandra-2.0' into trunk