Made mockito tree-ready

Package-Manager: portage-2.2.1
Made aspectj tree-ready

Package-Manager: portage-2.2.1
Slotted jopt-simple due to broken api

Package-Manager: portage-2.2.1
Fixed dependencies

Package-Manager: portage-2.2.1