also include changes from secure-scuttlebutt#fix-resume-migration-progress
also include changes from secure-scuttlebutt#fix-resume-migration-progress

until ssbc/secure-scuttlebutt#176 merges

ssbc/patchwork,ssbc/patchwork