Merge "delete_file() should force removal." into lmp-dev