Merge commit '4b6d6ebd8cb613d1975ef3fc6e7ba4218143364c' into cassandra-2.1.0
Fix UDT field selection with empty field

patch by mstepura; reviewed by slebresne for CASSANDRA-7670
Bogus deserialization of static cells from sstable

patch by slebresne; reviewed by iamaleksey for CASSANDRA-7684
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	CHANGES.txt