Change in jenkins[master]: Doing proper mock cleanup