Refuse conditions on deletes unless full PK is given

patch by thobbs; reviewed by slebresne for CASSANDRA-6430
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt