Update workspace dependencies

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
cnf: put junit and hamcrest into proper directories in buildrepo

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>