Bump CQL version to 3.1.7, update CQL docs

Follow up for CASSANDRA-6875
Merge branch 'cassandra-2.0' into cassandra-2.1