am 228f8261: Merge "delete_file() should force removal." into lmp-dev

* commit '228f8261fd778e1c03184b5f79f979d1a25abf50':
  delete_file() should force removal.