Clearer message for assertion error
Don't break API in minor rev, followup to CASSANDRA-6958
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
Merge branch 'cassandra-2.0' into cassandra-2.1