ninja fix: raise default concurrent compactors to 4 to avoid LCS test timeout
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk