Merge branch 'stable-2.6' * stable-2.6: Run plugin startup and shutdown as PluginUser Allow InternalUser (aka plugins) to see any internal group