Move group management to CLI. Bug 844415