change
fix '_' -> '-'
Changing the OSGi repackaging

We need to specify explicitly the artifact name
in order to enable dbuild to find the available
dependency. Also, additional changes and fixes.