KAFKA-1316 Follow-up patch for concurrent modification exception.