cqlsh: fix CREATE/ALTER WITH completion

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6196
Merge branch 'cassandra-2.0' into trunk