Change in jenkins[master]: Fix for heterogeneous mock versions