fix merge
Merge branch 'cassandra-2.0' into cassandra-2.1
fix merge
fix typos