Merge "Log deletion errors in  clean servers"