Sync with /sbin/hammer2 and libdmsg current