diff --git a/client/pom.xml b/client/pom.xml
index c09e10e7cb5..4ceaf588646 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -7,7 +7,8 @@
   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. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>cloud-client-ui</artifactId>
@@ -17,7 +18,7 @@
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
     <version>4.3.0-SNAPSHOT</version>
-  </parent> 
+  </parent>
   <dependencies>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
@@ -275,12 +276,6 @@
       <artifactId>cloud-plugin-host-anti-affinity</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-systemvm</artifactId>
-      <version>${project.version}</version>
-      <type>pom</type>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -351,25 +346,6 @@
         <artifactId>maven-antrun-plugin</artifactId>
         <version>1.7</version>
         <executions>
-          <!-- Copy the systemvm in the package phase as it is generated by console-proxy 
-            in the package phase. -->
-          <execution>
-            <id>copy-systemvm</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/vms">
-                  <fileset dir="${basedir}/../systemvm/dist">
-                    <include name="systemvm.zip" />
-                    <include name="systemvm.iso" />
-                  </fileset>
-                </copy>
-              </target>
-            </configuration>
-          </execution>
           <execution>
             <id>generate-resource</id>
             <phase>generate-resources</phase>
@@ -378,95 +354,93 @@
             </goals>
             <configuration>
               <target>
-                <copy
-                  todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
-                  <fileset dir="${basedir}/../scripts" />
+                <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
+                  <fileset dir="${basedir}/../scripts"/>
                 </copy>
                 <!-- CLOUDSTACK-1304 -->
-                <chmod perm="755" file="${basedir}/target/generated-webapp/WEB-INF/classes/scripts/**" type="both" />
+                <chmod perm="755"
+                  file="${basedir}/target/generated-webapp/WEB-INF/classes/scripts/**" type="both"/>
                 <copy todir="${basedir}/target/generated-webapp/WEB-INF/">
                   <fileset dir="${basedir}/WEB-INF/">
-                    <include name="web.xml" />
+                    <include name="web.xml"/>
                   </fileset>
                 </copy>
                 <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes">
                   <fileset dir="${basedir}/WEB-INF/classes">
-                    <include name="resources/**/*" />
+                    <include name="resources/**/*"/>
                   </fileset>
                 </copy>
                 <copy todir="${basedir}/target/generated-webapp">
-                  <fileset dir="${basedir}/../ui" />
+                  <fileset dir="${basedir}/../ui"/>
                 </copy>
-                <copy overwrite="true"
-                  todir="${basedir}/target/generated-webapp/WEB-INF/classes">
+                <copy overwrite="true" todir="${basedir}/target/generated-webapp/WEB-INF/classes">
                   <fileset dir="${basedir}/tomcatconf">
-                    <include name="*.in" />
+                    <include name="*.in"/>
                   </fileset>
-                  <globmapper from="*.in" to="*" />
+                  <globmapper from="*.in" to="*"/>
                   <filterchain>
                     <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
-                      <param type="propertiesfile" value="${cs.replace.properties}" />
+                      <param type="propertiesfile" value="${cs.replace.properties}"/>
                     </filterreader>
                   </filterchain>
                 </copy>
-                <copy overwrite="true"
-                  todir="${basedir}/target/generated-webapp/WEB-INF/classes">
+                <copy overwrite="true" todir="${basedir}/target/generated-webapp/WEB-INF/classes">
                   <fileset dir="${basedir}/tomcatconf">
-                    <include name="*.in" />
+                    <include name="*.in"/>
                   </fileset>
-                  <globmapper from="*.in" to="*" />
+                  <globmapper from="*.in" to="*"/>
                   <filterchain>
                     <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
-                      <param type="propertiesfile" value="${cs.replace.properties}" />
+                      <param type="propertiesfile" value="${cs.replace.properties}"/>
                     </filterreader>
                   </filterchain>
                 </copy>
                 <copy overwrite="true" todir="${basedir}/target/utilities/bin">
                   <fileset dir="${basedir}/../setup/bindir">
-                    <include name="*.in" />
+                    <include name="*.in"/>
                   </fileset>
-                  <globmapper from="*.in" to="*" />
+                  <globmapper from="*.in" to="*"/>
                   <filterchain>
                     <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
-                      <param type="propertiesfile" value="${cs.replace.properties}" />
+                      <param type="propertiesfile" value="${cs.replace.properties}"/>
                     </filterreader>
                   </filterchain>
                 </copy>
                 <copy overwrite="true" todir="${basedir}/target/utilities/bin">
                   <fileset dir="${basedir}/bindir">
-                    <include name="*.in" />
+                    <include name="*.in"/>
                   </fileset>
-                  <globmapper from="*.in" to="*" />
+                  <globmapper from="*.in" to="*"/>
                   <filterchain>
                     <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
-                      <param type="propertiesfile" value="${cs.replace.properties}" />
+                      <param type="propertiesfile" value="${cs.replace.properties}"/>
                     </filterreader>
                   </filterchain>
                 </copy>
                 <copy overwrite="true" todir="${basedir}/target/utilities/scripts/db">
                   <fileset dir="${basedir}/../setup/db">
-                    <include name="**/*" />
+                    <include name="**/*"/>
                   </fileset>
                   <filterchain>
                     <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
-                      <param type="propertiesfile" value="${cs.replace.properties}" />
+                      <param type="propertiesfile" value="${cs.replace.properties}"/>
                     </filterreader>
                   </filterchain>
                 </copy>
                 <copy overwrite="true" todir="${basedir}/target/conf">
                   <fileset dir="${basedir}/tomcatconf">
-                    <include name="*.in" />
+                    <include name="*.in"/>
                   </fileset>
-                  <globmapper from="*.in" to="*" />
+                  <globmapper from="*.in" to="*"/>
                   <filterchain>
                     <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
-                      <param type="propertiesfile" value="${cs.replace.properties}" />
+                      <param type="propertiesfile" value="${cs.replace.properties}"/>
                     </filterreader>
                   </filterchain>
                 </copy>
                 <copy overwrite="true" todir="${basedir}/target/conf">
                   <fileset dir="${basedir}/tomcatconf">
-                    <exclude name="*.in" />
+                    <exclude name="*.in"/>
                   </fileset>
                 </copy>
               </target>
@@ -484,8 +458,8 @@
                 <replaceregexp
                   file="${basedir}/target/generated-webapp/WEB-INF/classes/environment.properties"
                   match="cloud-stack-components-specification=.*"
-                  replace="cloud-stack-components-specification=components-nonoss.xml"
-                  byline="true" />
+                  replace="cloud-stack-components-specification=components-nonoss.xml" byline="true"
+                />
               </target>
             </configuration>
           </execution>
@@ -498,10 +472,9 @@
             <configuration>
               <target if="${simulator}">
                 <echo>test</echo>
-                <replaceregexp
-                  file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
-                  match="classpath:componentContext.xml" replace="classpath:simulatorComponentContext.xml"
-                  byline="true" />
+                <replaceregexp file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
+                  match="classpath:componentContext.xml"
+                  replace="classpath:simulatorComponentContext.xml" byline="true"/>
               </target>
             </configuration>
           </execution>
@@ -513,15 +486,13 @@
             </goals>
             <configuration>
               <target if="${nonoss}">
-                <replaceregexp
-                  file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
-                  match="classpath:componentContext.xml" replace="classpath:nonossComponentContext.xml"
-                  byline="true" />
+                <replaceregexp file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
+                  match="classpath:componentContext.xml"
+                  replace="classpath:nonossComponentContext.xml" byline="true"/>
                 <copy overwrite="true"
                   todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
-                  <fileset
-                    dir="${basedir}/../plugins/network-elements/cisco-vnmc/scripts">
-                    <include name="**/*" />
+                  <fileset dir="${basedir}/../plugins/network-elements/cisco-vnmc/scripts">
+                    <include name="**/*"/>
                   </fileset>
                 </copy>
               </target>
@@ -539,8 +510,7 @@
                 <replaceregexp
                   file="${basedir}/target/generated-webapp/WEB-INF/classes/applicationContext.xml"
                   match="com.cloud.consoleproxy.ConsoleProxyManagerImpl"
-                  replace="com.cloud.consoleproxy.StaticConsoleProxyManager"
-                  byline="true" />
+                  replace="com.cloud.consoleproxy.StaticConsoleProxyManager" byline="true"/>
               </target>
             </configuration>
           </execution>
@@ -592,19 +562,15 @@
               <pluginExecutions>
                 <pluginExecution>
                   <pluginExecutionFilter>
-                    <groupId>
-                      org.apache.maven.plugins
-                    </groupId>
-                    <artifactId>
-                      maven-antrun-plugin
-                    </artifactId>
+                    <groupId> org.apache.maven.plugins </groupId>
+                    <artifactId> maven-antrun-plugin </artifactId>
                     <versionRange>[1.7,)</versionRange>
                     <goals>
                       <goal>run</goal>
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
@@ -615,6 +581,51 @@
     </pluginManagement>
   </build>
   <profiles>
+    <profile>
+      <id>systemvm</id>
+      <activation>
+        <property>
+          <name>systemvm</name>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.cloudstack</groupId>
+          <artifactId>cloud-systemvm</artifactId>
+          <version>${project.version}</version>
+          <type>pom</type>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.7</version>
+            <executions>
+              <!-- Copy the systemvm in the package phase as it is generated by console-proxy 
+            in the package phase. -->
+              <execution>
+                <id>copy-systemvm</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/vms">
+                      <fileset dir="${basedir}/../systemvm/dist">
+                        <include name="systemvm.zip"/>
+                        <include name="systemvm.iso"/>
+                      </fileset>
+                    </copy>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>simulator</id>
       <activation>