Merge "Fixing job scheduler test flakiness"