Moved more runners to the new job loop

* Also corrected the parsoid job runner count by adding back 2

Change-Id: I0268f8a8dd43c6d5768006b2cbb52f1de8c64546