cleanup
Merge branch 'cassandra-1.2' into trunk
Fix bogus sharing of SliceQueryFilter when using superColumn

patch by slebresne; reviewed by jbellis for CASSANDRA-5123