Any objection to adding them to `buildsupport/osgi` which has other OSGi-related artifacts?