XCOMMONS-663: Upgrade to Mockito 1.10.7