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
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