fix time conversion to milliseconds in SimpleCondition.await

patch by jzhang reviewed by dbrosius for cassandra-7149
Merge branch 'cassandra-1.2' into cassandra-2.0
remove changes line for 7149 as it was not pulled forward
Fixup for CASSANDRA-6831 on 2.1
Fix super column filter conversion

patch by slebresne; reviewed by thobbs for CASSANDRA-7138
Fix ClassCastException on composite dense tables

patch by slebresne; reviewed by thobbs for CASSANDRA-7112
Merge branch 'cassandra-2.1' into trunk
Correctly delete scheduled range xfers

Patch by brandonwilliams, reviewed by aleksey for CASSANDRA-7143
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/StorageService.java
Merge branch 'cassandra-2.1' into trunk
remove stray bat file
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Cleanup and optimize collation and slice iterators

patch by Aleksey Yeschenko and Benedict Elliott Smith; reviewed by
Aleksey Yeschenko for CASSANDRA-7107
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
	src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
	src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
high-scale-lib upgrade

Patch by tjake; reviewed by Benedict Elliott Smith for CASSANDRA-7128
Merge branch 'cassandra-2.1' into trunk
reduce garbage in BatchlogManager.replayMutations

patch by dbrosius reviewed by jbellis for cassandra-7169
Merge branch 'cassandra-2.0' into cassandra-2.1