Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
Fix scrub against collection type

patch by yukim; reviewed by thobbs for CASSANDRA-7665
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk