This commit upgrades mockito to the latest currently available version as well as does some additional cleanup.