Re-enable unknown options in compaction/replication strategy

patch by slebresne; reviewed by xedin for CASSANDRA-4795
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql/CFPropDefs.java
	src/java/org/apache/cassandra/db/Table.java