diff --git a/patches/systemvm/debian/vpn/etc/ipsec.conf.orig b/patches/systemvm/debian/vpn/etc/ipsec.conf.orig
deleted file mode 100644
index d185e6cd502..00000000000
--- a/patches/systemvm/debian/vpn/etc/ipsec.conf.orig
+++ /dev/null
@@ -1,48 +0,0 @@
-# /etc/ipsec.conf - Openswan IPsec configuration file
-
-# This file:  /usr/share/doc/openswan/ipsec.conf-sample
-#
-# Manual:     ipsec.conf.5
-
-
-version	2.0	# conforms to second version of ipsec.conf specification
-
-# basic configuration
-config setup
-	# Do not set debug options to debug configuration issues!
-	# plutodebug / klipsdebug = "all", "none" or a combation from below:
-	# "raw crypt parsing emitting control klips pfkey natt x509 dpd private"
-	# eg:
-	# plutodebug="control parsing"
-	#
-	# enable to get logs per-peer
-	# plutoopts="--perpeerlog"
-	#
-	# Again: only enable plutodebug or klipsdebug when asked by a developer
-	#
-	# NAT-TRAVERSAL support, see README.NAT-Traversal
-	nat_traversal=yes
-	# exclude networks used on server side by adding %v4:!a.b.c.0/24
-	virtual_private=%v4:10.0.0.0/8,%v4:192.168.0.0/16,%v4:172.16.0.0/12
-	# OE is now off by default. Uncomment and change to on, to enable.
-	oe=off
-	# which IPsec stack to use. auto will try netkey, then klips then mast
-	protostack=auto
-	
-
-# Add connections here
-
-# sample VPN connection
-# for more examples, see /etc/ipsec.d/examples/
-#conn sample
-#		# Left security gateway, subnet behind it, nexthop toward right.
-#		left=10.0.0.1
-#		leftsubnet=172.16.0.0/24
-#		leftnexthop=10.22.33.44
-#		# Right security gateway, subnet behind it, nexthop toward left.
-#		right=10.12.12.1
-#		rightsubnet=192.168.0.0/24
-#		rightnexthop=10.101.102.103
-#		# To authorize this connection, but not actually start it, 
-#		# at startup, uncomment this.
-#		#auto=add
diff --git a/pom.xml b/pom.xml
index f41982cad03..772f5df4dd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,7 @@
     <cs.mail.version>1.4</cs.mail.version>
     <cs.axis.version>1.4</cs.axis.version>
     <cs.axis2.version>1.5.1</cs.axis2.version>
+    <cs.rampart.version>1.6.2</cs.rampart.version>
     <cs.axiom.version>1.2.8</cs.axiom.version>
     <cs.neethi.version>2.0.4</cs.neethi.version>
     <cs.servlet.version>2.4</cs.servlet.version>
@@ -183,7 +184,7 @@
           <version>0.8</version>
           <configuration>
             <numUnapprovedLicenses>0</numUnapprovedLicenses>
-            <excludeSubProjects>false</excludeSubProjects>
+            <excludeSubProjects>true</excludeSubProjects>
             <excludes>
               <exclude>.git/**</exclude>
               <exclude>.gitignore</exclude>
@@ -208,6 +209,48 @@
               <exclude>deps/XenServerJava/Makefile</exclude>
               <exclude>dist/console-proxy/js/jquery.js</exclude>
               <exclude>scripts/vm/systemvm/id_rsa.cloud</exclude>
+              <exclude>patches/systemvm/debian/xe/xen-vcpu-hotplug.rules</exclude>
+              <exclude>patches/systemvm/debian/xe/xe-linux-distribution.init</exclude>
+              <exclude>patches/systemvm/debian/systemvm.vmx</exclude>
+              <exclude>patches/systemvm/debian/config/etc/ssh/sshd_config</exclude>
+              <exclude>patches/systemvm/debian/config/etc/logrotate.d/haproxy</exclude>
+              <exclude>patches/systemvm/debian/config/etc/logrotate.d/dnsmasq</exclude>
+              <exclude>patches/systemvm/debian/config/etc/logrotate.d/apache2</exclude>
+              <exclude>patches/systemvm/debian/config/etc/logrotate.d/ppp</exclude>
+              <exclude>patches/systemvm/debian/config/etc/logrotate.d/rsyslog</exclude>
+              <exclude>patches/systemvm/debian/config/etc/vpcdnsmasq.conf</exclude>
+              <exclude>patches/systemvm/debian/config/etc/httpd/conf/httpd.conf</exclude>
+              <exclude>patches/systemvm/debian/config/etc/haproxy/haproxy.cfg</exclude>
+              <exclude>patches/systemvm/debian/config/etc/apache2/vhostexample.conf</exclude>
+              <exclude>patches/systemvm/debian/config/etc/apache2/sites-available/default-ssl</exclude>
+              <exclude>patches/systemvm/debian/config/etc/apache2/sites-available/default</exclude>
+              <exclude>patches/systemvm/debian/config/etc/apache2/httpd.conf</exclude>
+              <exclude>patches/systemvm/debian/config/etc/apache2/ports.conf</exclude>
+              <exclude>patches/systemvm/debian/config/etc/rsyslog.conf</exclude>
+              <exclude>patches/systemvm/debian/config/etc/cloud-nic.rules</exclude>
+              <exclude>patches/systemvm/debian/config/etc/logrotate.conf</exclude>
+              <exclude>patches/systemvm/debian/config/etc/init.d/postinit</exclude>
+              <exclude>patches/systemvm/debian/config/etc/modprobe.d/aesni_intel</exclude>
+              <exclude>patches/systemvm/debian/config/etc/sysctl.conf</exclude>
+              <exclude>patches/systemvm/debian/config/etc/dnsmasq.conf</exclude>
+              <exclude>patches/systemvm/debian/config/etc/rc.local</exclude>
+              <exclude>patches/systemvm/debian/config/root/redundant_router/heartbeat.sh.templ</exclude>
+              <exclude>patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ</exclude>
+              <exclude>patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ</exclude>
+              <exclude>patches/systemvm/debian/config/root/redundant_router/backup.sh.templ</exclude>
+              <exclude>patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ</exclude>
+              <exclude>patches/systemvm/debian/config/root/redundant_router/fault.sh.templ</exclude>
+              <exclude>patches/systemvm/debian/config/root/redundant_router/checkrouter.sh.templ</exclude>
+              <exclude>patches/systemvm/debian/config/root/redundant_router/master.sh.templ</exclude>
+              <exclude>patches/systemvm/debian/config/root/redundant_router/conntrackd.conf.templ</exclude>
+              <exclude>patches/systemvm/debian/config/root/redundant_router/enable_pubip.sh.templ</exclude>
+              <exclude>patches/systemvm/debian/config/var/lib/misc/dnsmasq.leases</exclude>
+              <exclude>patches/systemvm/debian/config/var/www/html/userdata/.htaccess</exclude>
+              <exclude>patches/systemvm/debian/config/var/www/html/latest/.htaccess</exclude>
+              <exclude>patches/systemvm/debian/vpn/etc/ipsec.conf.orig</exclude>
+              <exclude>patches/systemvm/debian/vpn/etc/ipsec.secrets.orig</exclude>
+              <exclude>patches/systemvm/debian/vpn/etc/ipsec.d/l2tp.conf</exclude>
+              <exclude>patches/systemvm/debian/vpn/etc/ipsec.secrets</exclude>
               <exclude>tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf</exclude>
               <exclude>tools/devcloud/devcloud.cfg</exclude>
               <exclude>ui/lib/flot/jquery.colorhelpers.js</exclude>
@@ -234,35 +277,6 @@
               <exclude>ui/lib/qunit/qunit.js</exclude>
               <exclude>ui/lib/reset.css</exclude>
               <exclude>waf</exclude>
-              <exclude>patches/systemvm/debian/systemvm.vmx</exclude>
-              <exclude>patches/systemvm/debian/config/root/.ssh/authorized_keys</exclude>
-              <exclude>patches/systemvm/debian/config/etc/apache2/httpd.conf</exclude>
-              <exclude>patches/systemvm/debian/config/etc/apache2/ports.conf</exclude>
-              <exclude>patches/systemvm/debian/config/etc/apache2/sites-available/default</exclude>
-              <exclude>patches/systemvm/debian/config/etc/apache2/sites-available/default-ssl</exclude>
-              <exclude>patches/systemvm/debian/config/etc/apache2/vhostexample.conf</exclude>
-              <exclude>patches/systemvm/debian/config/etc/dnsmasq.conf</exclude>
-              <exclude>patches/systemvm/debian/config/etc/vpcdnsmasq.conf</exclude>
-              <exclude>patches/systemvm/debian/config/etc/ssh/sshd_config</exclude> <!-- Pending resolution of CLOUDSTACK-145 -->
-              <exclude>patches/systemvm/debian/config/etc/rsyslog.conf</exclude> <!-- Pending resolution of CLOUDSTACK-147 -->
-              <exclude>patches/systemvm/debian/config/etc/logrotate.conf</exclude>
-              <exclude>patches/systemvm/debian/config/etc/logrotate.d/*</exclude>
-              <exclude>patches/systemvm/debian/config/etc/sysctl.conf</exclude>
-              <exclude>patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ</exclude>
-              <exclude>patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ</exclude>
-              <exclude>patches/systemvm/debian/config/root/redundant_router/conntrackd.conf.templ</exclude> <!-- Pending resolution of CLOUDSTACK-166 -->
-              <exclude>patches/systemvm/debian/vpn/etc/ipsec.conf</exclude>
-              <exclude>patches/systemvm/debian/vpn/etc/ppp/options.xl2tpd</exclude>
-              <exclude>patches/systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf</exclude>
-              <exclude>patches/systemvm/debian/vpn/etc/ipsec.secrets</exclude>
-              <exclude>patches/systemvm/debian/config/etc/haproxy/haproxy.cfg</exclude>
-              <exclude>patches/systemvm/debian/config/etc/cloud-nic.rules</exclude>
-              <exclude>patches/systemvm/debian/config/etc/modprobe.d/aesni_intel</exclude>
-              <exclude>patches/systemvm/debian/config/etc/rc.local</exclude>
-              <exclude>patches/systemvm/debian/config/var/www/html/userdata/.htaccess</exclude>
-              <exclude>patches/systemvm/debian/config/var/www/html/latest/.htaccess</exclude>
-              <exclude>patches/systemvm/debian/vpn/etc/ipsec.d/l2tp.conf</exclude>
-
             </excludes>
           </configuration>
         </plugin>
@@ -278,19 +292,6 @@
           	<maxmem>512m</maxmem>            
           </configuration>
         </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
@@ -324,12 +325,6 @@
         <module>deps</module>
       </modules>
     </profile>
-    <profile>
-      <id>developer</id>
-      <modules>
-        <module>developer</module>
-      </modules>
-    </profile>
   </profiles>
 
 </project>