Change in jenkins[master]: Added user restoration to mock cleanup