Bump cqlsh default CQL version to 3.1.7

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