Fix CFMetaData#isThriftCompatible() for PK-only tables

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7832
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1.0' into cassandra-2.1