Post-merge fixup
Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1
Fix typos
Merge branch 'cassandra-2.0' into cassandra-2.1