Change concurrent_compactors defaults
patch by jbellis; reviewed by bes for CASSANDRA-7139
Merge branch 'cassandra-2.1' into trunk