Merge pull request #2997 from devoncarew/nits

rev mockito; remove deprecated uses