am d4155721: Merge "Add some missing TEMP_FAILURE_RETRYs around unlink(2)"

* commit 'd415572117cbfc12f78c7d1c5844a7b62e68a2ff':
  Add some missing TEMP_FAILURE_RETRYs around unlink(2)