Bug 938695 - add group editing, misc. group add/edit cleanup