Update syntax for changing caching options.

Patch by marcuse, reviewed by slebresne for CASSANDRA-6745.
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql/AlterTableStatement.java
	src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java