fix up misapply of CASSANDRA-7964 nits
Run major compactions for repaired/unrepaired in parallel

Patch by marcuse; reviewed by belliottsmith for CASSANDRA-8510
Merge branch '2.1-fixup' into cassandra-2.1