Merge "Correctly set minimum priority on nodes." into oc-dev