Fix CREATE TABLE for CQL2

patch by Aleksey Yeschenko; reviewed by Sam Tunnicliffe for
CASSANDRA-8144
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java