Fixes #6879 - External user groups CLI
Fixes #6879 - Updated tests for external user groups
Fixes #6879 - External user groups CLI