CQL3 documentation fixes (#5878)
Merge branch 'cassandra-1.2' into cassandra-2.0.0