amdatu: fix an end-of-line in the bnd file

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

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