Upgrade Mockito dependency
Merge pull request #562 from hansjoachim/mockito

Upgrade Mockito dependency