Upstream changes to base GroupServer eggs