I just upgraded a machine from r336438 to r336855. When I ran mergemaster, it asked to delete a bunch of the /etc/rc.d scripts. Answering yes results in the machine being unbootable. I think that the rc.d-related changes in r336845 are the likely culprit. The following rc.d scripts are some of the missing, and there may be more: jail newsyslog sshd sysctl syslogd zfs