Minor cleanup of IAM groups progress.  GUI-335