Merge "Pass Executor to to PluginInstanceManager.Factory." into sc-v2-dev