I assume backwards compatibility in this area was broken by design. Adding
--max-parallel to these in 6dd27753803ae2091a9fc3aedc8e70548ea87675 was wrong
and negated their whole point, i.e. testing of backwards compatibility when
parallel options were not supported.
(cherry picked from commit ca0ad4922ada7ae013b035cfe1550a257a330809)