Change in jenkins[master]: Some small improvement to mock_runner