Wait for inprogress jobs to complete

Also, allow inprogress/complete jobs to run in parallel.

Change-Id: I1ce49b0244f7bf8ea123d53178217678c9d047e0
Merge "Wait for inprogress jobs to complete"