Change in jenkins[master]: Improve cleanup to avoid failures