diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml
index 0e12db0904f..ab9af163180 100644
--- a/console-proxy/pom.xml
+++ b/console-proxy/pom.xml
@@ -125,8 +125,8 @@
         <version>1.7</version>
         <executions>
           <execution>
-            <id>generate-resource</id>
-            <phase>generate-resources</phase>
+            <id>copy-cloud-scripts</id>
+            <phase>package</phase>
             <goals>
               <goal>run</goal>
             </goals>
diff --git a/docs/en-US/host-add.xml b/docs/en-US/host-add.xml
index c602d36d726..ebac7656d8d 100644
--- a/docs/en-US/host-add.xml
+++ b/docs/en-US/host-add.xml
@@ -26,7 +26,7 @@
 	<title>Adding a Host</title>
         <orderedlist>
             <listitem><para>Before adding a host to the &PRODUCT; configuration, you must first install your chosen hypervisor on the host. &PRODUCT; can manage hosts running VMs under a variety of hypervisors.</para> 
-              <para>The &PRODUCT; Installation Guide provides instructions on how to install each supported hypervisor
+              <para>The &PRODUCT; Installation Guide provides instructions on how to install each supported hypervisor</para>
                 <warning><para>Be sure you have performed the additional &PRODUCT;-specific configuration steps described in the hypervisor installation section for your particular hypervisor.</para></warning>
             </listitem>
             <listitem><para>Now add the hypervisor host to &PRODUCT;. The technique to use varies depending on the hypervisor.</para>
diff --git a/engine/service/pom.xml b/engine/service/pom.xml
index cd4e9531d28..38ff81591f2 100644
--- a/engine/service/pom.xml
+++ b/engine/service/pom.xml
@@ -27,7 +27,7 @@
   </parent>
   <artifactId>cloud-engine-service</artifactId>
   <packaging>war</packaging>
-  <name>CloudStack Cloud-Engine Service</name>
+  <name>Apache CloudStack Cloud Engine Service</name>
   <url>http://www.cloudstack.org</url>
   <dependencies>
     <dependency>
diff --git a/framework/events/pom.xml b/framework/events/pom.xml
index ef812e5a014..d21275a6744 100644
--- a/framework/events/pom.xml
+++ b/framework/events/pom.xml
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cloud-framework-events</artifactId>
-  <name>Apache CloudStack Event Notification Framework</name>
+  <name>Apache CloudStack Framework - Event Notification</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
diff --git a/framework/ipc/pom.xml b/framework/ipc/pom.xml
index 6afd1c49ef2..6e01b7ec5d2 100644
--- a/framework/ipc/pom.xml
+++ b/framework/ipc/pom.xml
@@ -12,6 +12,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cloud-framework-ipc</artifactId>
+  <name>Apache CloudStack Framework - IPC</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
diff --git a/framework/pom.xml b/framework/pom.xml
index 9ac1ae070c0..dafc0eb5a2d 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -19,7 +19,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cloudstack-framework</artifactId>
-  <name>Apache CloudStack framework POM</name>
+  <name>Apache CloudStack Framework</name>
   <packaging>pom</packaging>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml
index 2f890562190..e8322e03e59 100644
--- a/framework/rest/pom.xml
+++ b/framework/rest/pom.xml
@@ -16,58 +16,58 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloudstack-framework</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <artifactId>cloud-framework-rest</artifactId>
-  <name>CloudStack Framework for Providing REST</name>
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-jaxb-annotations</artifactId>
-      <version>2.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-      <version>2.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>2.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>2.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.jaxrs</groupId>
-      <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>2.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-bundle-jaxrs</artifactId>
-      <version>2.7.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-server</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.cloudstack</groupId>
+    <artifactId>cloudstack-framework</artifactId>
+    <version>4.1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <artifactId>cloud-framework-rest</artifactId>
+  <name>Apache CloudStack Framework - REST</name>
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <sourceDirectory>src</sourceDirectory>
+    <testSourceDirectory>test</testSourceDirectory>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-jaxb-annotations</artifactId>
+      <version>2.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>2.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>2.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-json-provider</artifactId>
+      <version>2.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-bundle-jaxrs</artifactId>
+      <version>2.7.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>jetty-server</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/plugins/hypervisors/ucs/pom.xml b/plugins/hypervisors/ucs/pom.xml
index aecace85fce..a0e4b449269 100755
--- a/plugins/hypervisors/ucs/pom.xml
+++ b/plugins/hypervisors/ucs/pom.xml
@@ -11,7 +11,7 @@
   <groupId>org.apache.cloudstack</groupId>
   <artifactId>cloud-plugin-hypervisor-ucs</artifactId>
   <version>4.1.0-SNAPSHOT</version>
-  <name>cloud-plugin-hypervisor-ucs</name>
+  <name>Apache CloudStack Plugin - Hypervisor UCS</name>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/server/pom.xml b/server/pom.xml
index 690f57fa350..602ed5b977b 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -126,6 +126,7 @@
             <exclude>com/cloud/vpc/*</exclude>
             <exclude>com/cloud/api/ListPerfTest.java</exclude>
             <exclude>com/cloud/network/vpn/RemoteAccessVpnTest.java</exclude>
+            <exclude>com/cloud/network/security/SecurityGroupManagerImpl2Test.java</exclude>
           </excludes>
         </configuration>
       </plugin>