6132
fix merge conflict
CHANGES
merge from 1.2
comment
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix skipping columns with multiple slices

patch by frousseau & slebresne; reviewed by frousseau & slebresne for CASSANDRA-6119
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
Fix test build
Disallow empty column names in cql
patch by dbrosius reviewed by slebresne for cassandra-6136
add concurrent sets to progressByHost (CASSANDRA-6129)
eliminate redundant classpath creation

Patch by eevans; reviewed by Anton Winter for CASSANDRA-6101
fix assertionerror from #6132
cleanup
merge from 1.2