[rhel7/master/f21 2/2] Add support for custom gid to advanced user setup (#1163803)