Merge "Add some missing TEMP_FAILURE_RETRYs around unlink(2)"