OSGi dependency generator fixes from Alphonse Van Assche (ticket #101)