Merge "Run plugin startup and shutdown as PluginUser" into stable-2.6