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