Fix #837: Small tweaks to bnd.bnd generated with maven layout

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