Reenable using the manifest from maven-bundle-plugin run (#503)

* Reenable using the manifest from maven-bundle-plugin run

* Also enable manifest changes again

* Remove import tweaks. Add optional bnd.bnd config

pom.xml

@@ -310,7 +310,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>${maven.jar.version}</version>
-                <!--
                 <configuration>
                     <archive>
                         <manifest>
@@ -322,7 +321,6 @@
                         </manifestFile>
                     </archive>
                 </configuration>
-                -->
             </plugin>
             <!-- Allow for writing tests in Groovy: -->
             <plugin>
@@ -445,13 +443,7 @@
                 </executions>
                 <configuration>
                     <instructions>
-                        <Import-Package><![CDATA[
-                            android.util;resolution:=optional,
-                            org.bouncycastle.jce;resolution:=optional,
-                            org.bouncycastle.jce.spec;resolution:=optional,
-                            *
-                        ]]>
-                        </Import-Package>
+                        <_include>-bnd.bnd</_include>
                     </instructions>
                 </configuration>
             </plugin>