Merge "Fix scheduling algorithm for KaaS jobs"