Properly reject token function in DELETE statements

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

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
Merge branch 'cassandra-2.1' into trunk