Merge "Use max() for job count for sanity"