cqlsh: fix BATCH CAS result printing (for once #6561 is committed)
remove dead 'withOldCfIds' parm to SchemaLoader
Merge branch 'cassandra-2.0' into trunk