Fix cf name extraction from manifest in Directories.migrateFile()

patch by Marcus Eriksson; reviewed by Aleksey Yeschenko for
CASSANDRA-5242
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/Directories.java
Merge branch 'cassandra-1.2' into trunk
IndexHelper.skipBloomFilters won't skip non-SHA filters
patch by Carl Yeksigian; reviewed by jasobrown for CASSANDRA-5385
Merge remote-tracking branch 'apache/cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
	src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
	test/unit/org/apache/cassandra/db/ScrubTest.java
cqlsh: Print maps ordered by key, sort sets

patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5413
Merge branch 'cassandra-1.2' into trunk
Add yaml network topology snitch for mixed ec2/other envs
Patch by Eric Dong, reviewed by brandonwilliams for CASSANDRA-5339
Add cassandra-topology.yaml to deb pkg
Merge ColumnFamily, ISortedColumns.  Add EmptyColumns and UnsortedColumns; clean up TMBSC, ABSC, and ASC
patch by jbellis; reviewed by Carl Yeksigian for CASSANDRA-5403
use guava's Iterators class and emptyIterator
with HashCodeBuilder use toHashCode() not hashCode()
fix duplicate ip address error message
IndexHelper.skipBloomFilters won't skip non-SHA filters, part 2
patch by Carl Yeksigian; reviewed by jasobrown got CASSANDRA-5385
comments and simplify comparator
OCD-ninja CFMetaData.BatchlogCF -> CFMetaData.BatchlogCf fix
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/BatchlogManager.java
OCD-ninja CFMetaData.CompactionLogCF -> CFMetaData.CompactionLogCf fix
fix regression when requested range does not overlap an sstable at all
patch by marcuse; reviewed by jbellis for CASSANDRA-5407
semi-ninja trivial IOE cleanup

patch by Aleksey Yeschenko; reviewed by Brandon Williams