Store a plugin and server reference.
Merge remote-tracking branch 'origin/groupmanager' into 2.9