diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index b82cc52f1c..f4305fe14c 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -64,55 +64,43 @@
                </execution>
             </executions>
          </plugin>
-         
-         <!-- License header generation -->
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
-            <artifactId>license-maven-plugin</artifactId>          
-            <configuration>                        
+            <artifactId>license-maven-plugin</artifactId>
+            <configuration>
                <licenseName>alfresco_enterprise</licenseName>
                <licenseResolver>file:${project.parent.basedir}/license</licenseResolver>
                <descriptionTemplate>${project.parent.basedir}/license/description.ftl</descriptionTemplate>
             </configuration>
-         </plugin> 
-	      
+         </plugin>
       </plugins>
       <pluginManagement>
-      	<plugins>
-      		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-      		<plugin>
-      			<groupId>org.eclipse.m2e</groupId>
-      			<artifactId>lifecycle-mapping</artifactId>
-      			<version>1.0.0</version>
-      			<configuration>
-      				<lifecycleMappingMetadata>
-      					<pluginExecutions>
-      						<pluginExecution>
-      							<pluginExecutionFilter>
-      								<groupId>
-      									org.codehaus.mojo
-      								</groupId>
-      								<artifactId>
-      									license-maven-plugin
-      								</artifactId>
-      								<versionRange>
-      									[1.8,)
-      								</versionRange>
-      								<goals>
-      									<goal>
-      										update-file-header
-      									</goal>
-      								</goals>
-      							</pluginExecutionFilter>
-      							<action>
-      								<ignore />
-      							</action>
-      						</pluginExecution>      						
-      					</pluginExecutions>
-      				</lifecycleMappingMetadata>
-      			</configuration>
-      		</plugin>
-      	</plugins>
+         <plugins>
+            <plugin>
+               <groupId>org.eclipse.m2e</groupId>
+               <artifactId>lifecycle-mapping</artifactId>
+               <version>1.0.0</version>
+               <configuration>
+                  <lifecycleMappingMetadata>
+                     <pluginExecutions>
+                        <pluginExecution>
+                           <pluginExecutionFilter>
+                              <groupId>org.codehaus.mojo</groupId>
+                              <artifactId>license-maven-plugin</artifactId>
+                              <versionRange>[1.8,)</versionRange>
+                              <goals>
+                                 <goal>update-file-header</goal>
+                              </goals>
+                           </pluginExecutionFilter>
+                           <action>
+                              <ignore />
+                           </action>
+                        </pluginExecution>
+                     </pluginExecutions>
+                  </lifecycleMappingMetadata>
+               </configuration>
+            </plugin>
+         </plugins>
       </pluginManagement>
    </build>
 
@@ -241,24 +229,12 @@
                         </goals>
                         <configuration>
                            <artifactItems>
-                              <artifactItem>
-                                 <groupId>org.alfresco</groupId>
-                                 <artifactId>alfresco-rm-community-share</artifactId>
-                                 <version>${project.version}</version>
-                                 <type>amp</type>
-                              </artifactItem>
                               <artifactItem>
                                  <groupId>org.alfresco</groupId>
                                  <artifactId>alfresco-rm-enterprise-share</artifactId>
                                  <version>${project.version}</version>
                                  <type>amp</type>
                               </artifactItem>
-                              <artifactItem>
-                                 <groupId>org.alfresco</groupId>
-                                 <artifactId>alfresco-rm-community-repo</artifactId>
-                                 <version>${project.version}</version>
-                                 <type>amp</type>
-                              </artifactItem>
                               <artifactItem>
                                  <groupId>org.alfresco</groupId>
                                  <artifactId>alfresco-rm-enterprise-repo</artifactId>
@@ -277,18 +253,6 @@
                   <artifactId>alfresco-maven-plugin</artifactId>
                   <extensions>true</extensions>
                   <executions>
-                     <execution>
-                        <id>install-community-repo-amp</id>
-                        <goals>
-                           <goal>install</goal>
-                        </goals>
-                        <phase>process-test-resources</phase>
-                        <configuration>
-                           <backup>true</backup>
-                           <ampLocation>${project.build.directory}/amps/alfresco-rm-community-repo-${project.version}.amp</ampLocation>
-                           <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation>
-                        </configuration>
-                     </execution>
                      <execution>
                         <id>install-enterprise-repo-amp</id>
                         <goals>
@@ -301,18 +265,6 @@
                            <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation>
                         </configuration>
                      </execution>
-                     <execution>
-                        <id>install-community-share-amp</id>
-                        <goals>
-                           <goal>install</goal>
-                        </goals>
-                        <phase>process-test-resources</phase>
-                        <configuration>
-                           <backup>true</backup>
-                           <ampLocation>${project.build.directory}/amps/alfresco-rm-community-share-${project.version}.amp</ampLocation>
-                           <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war</warLocation>
-                        </configuration>
-                     </execution>
                      <execution>
                         <id>install-enterprise-share-amp</id>
                         <goals>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 75a0ce42e9..adb13aef9d 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <artifactId>alfresco-rm-community-repo</artifactId>
    <name>Alfresco Records Management Community Repo</name>
-   <description>Alfresco Record Management Core Repository Extension</description>
+   <description>Alfresco Record Management Community Repository Extension</description>
    <packaging>amp</packaging>
 
    <parent>
@@ -85,10 +85,10 @@
                   </goals>
                   <configuration>
                      <target>
-                        <copy todir="${project.build.directory}/${project.build.finalName}/config/alfresco">
+                        <move todir="${project.build.directory}/${project.build.finalName}/config/alfresco">
                            <fileset dir="${project.build.outputDirectory}/alfresco" />
-                        </copy>
-                        <move file="${project.build.directory}/${project.build.finalName}/config/alfresco/module/org_alfresco_module_rm/module.properties" todir="${project.build.directory}/${project.build.finalName}" />
+                        </move>
+                        <copy file="${project.build.directory}/${project.build.finalName}/config/alfresco/module/org_alfresco_module_rm/module.properties" todir="${project.build.directory}/${project.build.finalName}" />
                      </target>
                   </configuration>
                </execution>
@@ -207,24 +207,21 @@
                </excludes>
             </configuration>
          </plugin>
-
-            <!-- License header generation -->
-            <plugin>
-               <groupId>org.codehaus.mojo</groupId>
-               <artifactId>license-maven-plugin</artifactId>
-               <configuration>
-                  <licenseName>alfresco_community</licenseName>
-                  <roots>
-                     <root>source/java</root>
-                     <root>unit-test/java</root>
-                     <root>source/compatibility</root>
-                     <root>config</root>
-                     <root>test/java</root>
-                     <root>test/resources</root>
-                  </roots>
-               </configuration>
-            </plugin>
-
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>license-maven-plugin</artifactId>
+            <configuration>
+               <licenseName>alfresco_community</licenseName>
+               <roots>
+                  <root>source/java</root>
+                  <root>unit-test/java</root>
+                  <root>source/compatibility</root>
+                  <root>config</root>
+                  <root>test/java</root>
+                  <root>test/resources</root>
+               </roots>
+            </configuration>
+         </plugin>
       </plugins>
       <pluginManagement>
          <plugins>