bump cqlsh's DEFAULT_CQLVER to 3.1.6
Merge branch 'cassandra-2.1' into trunk