Some OSGi manifest fixes

Dependency on org.junit set to optonal
Self-dependecy removed