T1088 - check for existing field group before adding admin group
Merging pull request 578.