Index: dev-tools/maven/pom.xml.template
===================================================================
--- dev-tools/maven/pom.xml.template	(revision 1131485)
+++ dev-tools/maven/pom.xml.template	(working copy)
@@ -575,6 +575,11 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <version>2.3.4</version>
+        <configuration>
+          <instructions>
+          	<Export-Package>*;-split-package:=merge-first</Export-Package>
+          </instructions>
+        </configuration>
         <executions>
           <execution>
             <id>bundle-manifest</id>