merge in fixes 4.10 to 4.15 of old fsck; fix directory salvage code