Merge "Make sure to synchronize on references to plugin dependencies" into oc-dev