Merge "Replace mockito-all by mockito-core (see Bug 7662)"