apply mock clean up
Merge branch '2.10.3' of https://github.com/Altiscale/scalabuild into 2.10.3