fix LCST better
patch by Marcus Eriksson
cli: Quote ks and cf names in schema output when needed

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5052
Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk