Fix prepared marker for collections inside UDT
patch by slebresne; reviewed by thobbs for CASSANDRA-7472
Merge branch 'cassandra-2.1.0' into cassandra-2.1