ENG-5573 patch regression in topend end-of-run cleanup