diff --git a/pom.xml b/pom.xml
index d104a7a8ea..b63e5cdbec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,120 +175,11 @@
          </build>
       </profile>
 
-<!--
-  Enables AMP specific processing when a module.properties file is found.
-  The following files will be filtered and copied to the test-classpath
-  so they can be picked up by tests and tomcat embedded:
-      module.properties file for the AMP
-      /config directory content for the AMP
--->
-      <profile>
-         <id>enable-amp</id>
-         <activation>
-            <file>
-               <exists>src/main/amp/module.properties</exists>
-            </file>
-         </activation>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.alfresco.maven.plugin</groupId>
-                  <artifactId>alfresco-maven-plugin</artifactId>
-                  <extensions>true</extensions>
-               </plugin>
-               <!-- Copies module properties to the test classpath in the right location,
-                    so that it can be picked up by tests and tomcat embedded -->
-               <plugin>
-                  <artifactId>maven-resources-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>add-module-properties-to-test-classpath</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                           <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                           <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
-                           <resources>
-                              <resource>
-                                 <directory>${app.amp.folder}</directory>
-                                 <includes>
-                                    <include>module.properties</include>
-                                 </includes>
-                                 <filtering>${app.filtering.enabled}</filtering>
-                                 <targetPath>alfresco/module/${project.artifactId}</targetPath>
-                              </resource>
-                           </resources>
-                        </configuration>
-                     </execution>
-                     <execution>
-                        <id>add-module-config-to-test-classpath</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                           <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                           <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
-                           <resources>
-                              <resource>
-                                 <directory>${app.amp.folder}/config</directory>
-                                 <includes>
-                                    <include>**/*</include>
-                                 </includes>
-                                 <filtering>${app.filtering.enabled}</filtering>
-                              </resource>
-                           </resources>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-
       <!--
-        The following 2 profiles adds the /properties directories as resource directories in the project.
+        The following profile adds the /properties directories as resource directories in the project.
         This means we can filter the property files in these directories.
         The presence of this /properties directory also activates these profiles.
         -->
-      <profile>
-         <id>enable-properties-filtering</id>
-         <activation>
-            <file>
-               <!-- No properties allowed here. Only hardcoded values are properly interpreted -->
-               <exists>src/main/properties</exists>
-            </file>
-         </activation>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.codehaus.mojo</groupId>
-                  <artifactId>build-helper-maven-plugin</artifactId>
-                  <version>${maven.buildhelper.version}</version>
-                  <executions>
-                     <execution>
-                        <id>add-env-properties</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                           <goal>add-resource</goal>
-                        </goals>
-                        <configuration>
-                           <resources>
-                              <resource>
-                                 <directory>${app.properties.folder}</directory>
-                                 <includes>
-                                    <include>${app.properties.include}</include>
-                                 </includes>
-                                 <filtering>${app.filtering.enabled}</filtering>
-                              </resource>
-                           </resources>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
       <profile>
          <id>enable-test-properties-filtering</id>
          <activation>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 72a24a28a9..5623289ec5 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -480,6 +480,7 @@
    </dependencies>
 
    <profiles>
+
       <profile>
          <id>use-mysql</id>
          <properties>