Merge "More small fixes/adjustments to job scheduler." into oc-dev