Merge "Don't over-acquire NPMS locks." into oc-mr1-dev