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

Change-Id: If7cb26f43e85a11cb99ce9be511c44d35ddaca02