updated hard-disk-resume patches for resubmission upstream