Merge branch 'mockito-dev-reqs' into 'master'

Add mockito for dev requiremnts

See merge request !242
24 jobs for master in 17 minutes and 4 seconds (queued for 7 seconds)