Fixes to AS7 adapter

distribution/adapters/as7-adapter-zip/assembly.xml

@@ -11,6 +11,7 @@
         <fileSet>
             <directory>${project.build.directory}/unpacked</directory>
             <includes>
+                <include>org/bouncycastle/**</include>
                 <include>net/iharder/base64/**</include>
                 <include>org/apache/httpcomponents/**</include>
                 <include>org/keycloak/keycloak-core/**</include>
@@ -23,7 +24,7 @@
             <excludes>
                 <exclude>**/*.war</exclude>
             </excludes>
-            <outputDirectory>modules/system/layers/base</outputDirectory>
+            <outputDirectory>modules</outputDirectory>
         </fileSet>
     </fileSets>
 </assembly>