Patch Set 3:

I just see an extra bundle as too much extra complexity.

We're encouraging downstream consumers to use Import-Package rather than Require-Bundle to permit us to repackage easier.  Maven users might be impacted if we moved the API code in the future, but its a relatively minor thing to update in your application's pom.xml when you also update the version number.  So I think we're OK to split this later if/when it becomes necessary to do.