Ninja: fix check for duplicate cols in INSERT

This was caused by the changes for CASSANDRA-8178
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
Merge branch 'cassandra-2.1' into trunk
Fix size calculations for prepared statements

Patch by Benjamin Lerer; reviewed by Dave Brosius for CASSANDRA-8231
Merge branch 'cassandra-2.1' into trunk
Add missing jamm jar from CASSANDRA-8231 commit
Merge branch 'cassandra-2.1' into trunk