Restore support for OSGi

Description

This is delayed until 6.x on purpose.

Environment

None

Assignee

Unassigned

Reporter

Yoann Rodière