Ninja-fix counter-in-primary-key validation exception message
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java