Revert "Temporarily hard-code bnd defaults"

This reverts commit ede8f7537edb453af3c32e7935d6347346f28a1a.

My Eclipse Kepler install was messed up it appears.

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