Fix error when CONTAINS is used with a bind marker

patch by slebresne; reviewed by tjake for CASSANDRA-7502
Properly reject unknown UDT fields

patch by slebresne; reviewed by tjake for CASSANDRA-7484
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	CHANGES.txt