master
Bael 7898 - fixing annotation (#16852)
BAEL-5778 @RunWith(SpringRunner.class) vs @RunWith(MockitoJUnitRunner.class) (#12991)
Moved spring-mockito to testing-modules (#12476)