Suggestion:

The distro currently has /lib/osgi. Move that to /lib/optional/osgi, then add features.xml there.