Change in jenkins[master]: Mock cleanup fix