Follow up to 7111 to fix failing unit tests on trunk

Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-7111
Update cqlsh python driver to 2.1

Patch by Mikhail Stepura and Tyler Hobbs; reviewed by Aleksey Yeschenko
for CASSANDRA-7509
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Ninja: fix grammar for tuple type in CQL docs

Follow up for CASSANDRA-7527
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix row size miscalculation in LazilyCompactedRow

when RangeTombstone is involved.
patch by yukim; reviewed by jbellis for CASSANDRA-7543
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
update column_index_size_in_kb description
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Handle queries on multiple secondary index types

Patch and review by Sam Tunnicliffe and Tyler Hobbs for CASSANDRA-7525
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk