Attempt to support jpda in OsgiEquinox plugin, code cleanup