Switch to plain Scala OSGi bundles.

# Please do NOT merge

This is in preparation for the switch to PSOb and needs to be synchronized with upstream projects.