CQLSH: adjusted compaction_strategy_options with the latest docs

patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-7185
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
Ninja: add missing "enabled" option to compaction options docs

Done for CASSANDRA-7185
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Make commitlog archive+restore more robust
patch by bes; reviewed by jbellis for CASSANDRA-6974
inline
Merge branch 'cassandra-2.1' into trunk
prefer MemoryUtil.getByteBuffer to JNA Native.getDirectByteBuffer; specify native endian on the former
patch by bes; reviewed by jbellis for CASSANDRA-6575
Merge branch 'cassandra-2.1' into trunk