Merge "Move server groups schema into its own file"