* This fixes an issue where we need to use id to get the name.
* This fixes support for the singleusergroup plugin, by using id instead
of name when saving included groups. Similar to what becky did for
members [1] and same for when deleting included group.
* Adds more tests to make sure we don't have problems saving / deleting
included groups.
[1] I588b525fd40c6dbef0a372d103f4cca3ea0466fd
Bug: Issue 9000
Change-Id: Icaeee771cf09dabc345860a836157db93ef21d33