Merge f62d763956 into 4db99f4012

docs/UPDATING

@@ -1,3 +1,8 @@
+20181115:
+	The "operator" group resumes the ID 5 instead 0 which was a workaround
+	added with the change here on 20170218. This was a change to ease the
+	migration from "operator" to "wheel" as the root group.
+
 20170303:
 	The entire network stack has been replaced.  This requires two updates.
 	First, BEFORE rebooting, either before or after rebuilding the system,

etc/group

@@ -3,7 +3,7 @@ daemon:*:1:daemon
 kmem:*:2:root
 sys:*:3:root
 tty:*:4:root
-operator:*:0:root
+operator:*:5:root
 mail:*:6:
 bin:*:7:
 wsrc:*:9:
@@ -27,6 +27,8 @@ _tss:*:28:
 _gpio:*:29:
 _rtadvd:*:30:
 guest:*:31:root
+_unbound:*:32:
+_nsd:*:33:
 nobody:*:39:
 utmp:*:45:
 authpf:*:72:

etc/master.passwd

@@ -19,6 +19,8 @@ _tests:*:26:26::0:0:& pseudo-user:/nonexistent:/sbin/nologin
 _tcpdump:*:27:27::0:0:& pseudo-user:/var/chroot/tcpdump:/sbin/nologin
 _tss:*:28:28::0:0:& pseudo-user:/var/tpm:/sbin/nologin
 _rtadvd:*:30:30::0:0:& pseudo-user:/var/chroot/rtadvd:/sbin/nologin
+_unbound:*:32:32::0:0:& pseudo-user:/var/chroot/unbound:/sbin/nologin
+_nsd:*:33:33::0:0:& pseudo-user:/var/chroot/nsd:/sbin/nologin
 uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/nonexistent:/sbin/nologin
 service:*:999:0::0:0:System Services:/:/sbin/nologin
 nobody:*:32767:39::0:0:Unprivileged user:/nonexistent:/sbin/nologin