Merge "Updates to constructor of PluginInstanceManager.Factory" into sc-v2-dev