Fix CQL3 composite partition key error

patch by slebresne; reviewed by jbellis for CASSANDRA-5240
Allow IN clause for last clustering key

patch by slebresne; reviewed by jbellis for CASSANDRA-5230
Merge branch 'cassandra-1.2' into trunk