Backport CASSANDRA-6196 to 1.2

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

Conflicts:
	CHANGES.txt
	bin/cqlsh
Merge branch 'cassandra-2.0' into trunk