diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index 2e426550afa..06c9d7e058a 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -47,6 +47,12 @@
       <artifactId>axis2-webapp</artifactId>
       <type>war</type>
       <version>${cs.axis2.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.ws.commons.axiom</groupId>
@@ -123,6 +129,10 @@
            <groupId>org.apache.xalan</groupId>
            <artifactId>xalan</artifactId>
         </exclusion>
+        <exclusion>
+           <groupId>org.opensaml</groupId>
+          <artifactId>opensaml</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -139,6 +149,10 @@
            <groupId>org.apache.xalan</groupId>
            <artifactId>xalan</artifactId>
         </exclusion>
+        <exclusion>
+           <groupId>org.opensaml</groupId>
+          <artifactId>opensaml</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -151,6 +165,10 @@
            <groupId>org.apache.xalan</groupId>
            <artifactId>xalan</artifactId>
         </exclusion>
+        <exclusion>
+           <groupId>org.opensaml</groupId>
+          <artifactId>opensaml</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -163,6 +181,10 @@
            <groupId>org.apache.xalan</groupId>
            <artifactId>xalan</artifactId>
         </exclusion>
+        <exclusion>
+           <groupId>org.opensaml</groupId>
+          <artifactId>opensaml</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -175,6 +197,10 @@
            <groupId>org.apache.xalan</groupId>
            <artifactId>xalan</artifactId>
         </exclusion>
+        <exclusion>
+           <groupId>org.opensaml</groupId>
+          <artifactId>opensaml</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index 11d3b416d92..fdd594e72af 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -261,7 +261,7 @@ migrateVolume=org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd;15
 ####                                 use that key...the key is stored in the db associated w/
 ####                                 the userId...every request to the developer API should be
 ####                                 checked against the key
-registerUserKeys=org.apache.cloudstack.api.command.admin.user.RegisterCmd;1
+registerUserKeys=org.apache.cloudstack.api.command.admin.user.RegisterCmd;15
 
 ### async-query command
 queryAsyncJobResult=org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd;15
diff --git a/docs/en-US/changing-secondary-storage-servers.xml b/docs/en-US/changing-secondary-storage-servers.xml
index 62ad65015a3..a628eec9b39 100644
--- a/docs/en-US/changing-secondary-storage-servers.xml
+++ b/docs/en-US/changing-secondary-storage-servers.xml
@@ -22,7 +22,7 @@
  under the License.
 -->
 
-<section id="changing-secondary-storage-serversp">
+<section id="changing-secondary-storage-servers">
     <title>Changing Secondary Storage Servers</title>
     <para>You can change the secondary storage NFS mount.  Perform the following steps to do so:</para>
         <orderedlist>
diff --git a/docs/en-US/changing-secondary-storage-serversp.xml b/docs/en-US/changing-secondary-storage-serversp.xml
deleted file mode 100644
index 62ad65015a3..00000000000
--- a/docs/en-US/changing-secondary-storage-serversp.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<section id="changing-secondary-storage-serversp">
-    <title>Changing Secondary Storage Servers</title>
-    <para>You can change the secondary storage NFS mount.  Perform the following steps to do so:</para>
-        <orderedlist>
-            <listitem><para>Stop all running Management Servers.</para></listitem>
-            <listitem><para>Wait 30 minutes.  This allows any writes to secondary storage to complete.</para></listitem>
-            <listitem><para>Copy all files from the old secondary storage mount to the new.</para></listitem>
-            <listitem><para>Use the procedure above to change the IP address for secondary storage if required.</para></listitem>
-            <listitem><para>Start the Management Server.</para></listitem>
-        </orderedlist>
-    </section>
-
diff --git a/docs/en-US/configure-xenserver-dom-memory.xml b/docs/en-US/configure-xenserver-dom-memory.xml
deleted file mode 100644
index 0a02d3e3818..00000000000
--- a/docs/en-US/configure-xenserver-dom-memory.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
-%BOOK_ENTITIES;
-]>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<section id="configure-xenserver-dom0-memory">
-    <title>Configure XenServer dom0 Memory</title>
-    <para>Configure the XenServer dom0 settings to allocate more memory to dom0. This can enable XenServer to handle larger numbers of virtual machines. We recommend 2940 MB of RAM for XenServer dom0.  For instructions on how to do this, see  <ulink url="http://support.citrix.com/article/CTX126531">Citrix Knowledgebase Article</ulink>.The article refers to XenServer 5.6, but the same information applies to XenServer 6</para>
-</section>
-      
diff --git a/scripts/vm/network/vnet/modifyvlan.sh b/scripts/vm/network/vnet/modifyvlan.sh
index 5577825ea54..8ed3905a579 100755
--- a/scripts/vm/network/vnet/modifyvlan.sh
+++ b/scripts/vm/network/vnet/modifyvlan.sh
@@ -67,6 +67,8 @@ addVlan() {
 				return 2
 			fi
 		fi
+
+		brctl setfd $vlanBr 0
 	fi
 	
 	#pif is eslaved into vlanBr?
diff --git a/test/integration/component/test_snapshots.py b/test/integration/component/test_snapshots.py
index 8659f14309a..825b8c6877e 100644
--- a/test/integration/component/test_snapshots.py
+++ b/test/integration/component/test_snapshots.py
@@ -582,7 +582,7 @@ class TestSnapshots(cloudstackTestCase):
         return
 
     @attr(speed = "slow")
-    @attr(tags = ["advanced", "advancedns", "smoke"])
+    @attr(tags = ["advanced", "advancedns", "smoke", "xen"])
     def test_03_volume_from_snapshot(self):
         """Create volumes from snapshots
         """
@@ -995,7 +995,7 @@ class TestSnapshots(cloudstackTestCase):
         return
 
     @attr(speed = "slow")
-    @attr(tags = ["advanced", "advancedns", "smoke"])
+    @attr(tags = ["advanced", "advancedns", "smoke", "xen"])
     def test_07_template_from_snapshot(self):
         """Create Template from snapshot
         """
@@ -1901,7 +1901,7 @@ class TestSnapshotDetachedDisk(cloudstackTestCase):
         return
 
     @attr(speed = "slow")
-    @attr(tags = ["advanced", "advancedns"])
+    @attr(tags = ["advanced", "advancedns", "xen"])
     def test_03_snapshot_detachedDisk(self):
         """Test snapshot from detached disk
         """
diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index ba741a4f063..de8149fe877 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -1282,6 +1282,7 @@
     } else {
         if(isSelfOrChildDomainUser(jsonObj.username, jsonObj.accounttype, jsonObj.domainid, jsonObj.iscallerchilddomain)) {
             allowedActions.push("changePassword");
+            allowedActions.push("generateKeys");
         }
     }
     return allowedActions;