Merge pull request #382 from jtopjian/os-server-groups

Adds os-server-groups