Fix bug with freebsd-update(8) that does not ensure the previousupgrade was completed. [EN-15:04]Fix deadlock on reboot with UFS tuned with SU+J. [EN-15:05]Approved by: so