Merge "Improve Mockito 2.7.13 compatibility classes"