Thrift CQLPreparedResult don't include type arguments

patch by slebresne; reviewed by jbellis for CASSANDRA-5311
Fix compaction not removing columns when bf_fp_ratio is 1; patch by yukim, reviewed by jbellis and pcmanus for CASSANDRA-5182
Merge branch 'cassandra-1.2' into trunk