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

Change-Id: Iaefeebaedf7d46274deec345c2ce58fa13724a17