Merge "Changes to the signature of PluginManagerImpl." into sc-v2-dev