From 32e5fe375bb4ed5479982f868b24ef3afa178ac9 Mon Sep 17 00:00:00 2001
From: Samuel Langlois <samuel.langlois@alfresco.com>
Date: Mon, 29 Feb 2016 16:49:34 +0000
Subject: [PATCH 01/15] ACE-5135 ACE-5131 Pre-apply share-services AMP in
 alfresco.war packaged in EAR

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@122874 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 ear/pom.xml                    |  6 ++--
 enterprise-war-for-ear/pom.xml | 57 ++++++++++++++++++++++++++++++++++
 pom.xml                        |  1 +
 3 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 enterprise-war-for-ear/pom.xml

diff --git a/ear/pom.xml b/ear/pom.xml
index 256a05c919..511d11ae07 100644
--- a/ear/pom.xml
+++ b/ear/pom.xml
@@ -26,8 +26,8 @@
         <!-- WARs to include in the EAR -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-platform-enterprise</artifactId>
-            <version>${alfresco.platform.version}</version>
+            <artifactId>alfresco-enterprise-war-for-ear</artifactId>
+            <version>${project.version}</version>
             <type>war</type>
         </dependency>
         <dependency>
@@ -178,7 +178,7 @@
                     <modules>
                         <webModule>
                             <groupId>org.alfresco</groupId>
-                            <artifactId>alfresco-platform-enterprise</artifactId>
+                            <artifactId>alfresco-enterprise-war-for-ear</artifactId>
                             <bundleFileName>alfresco.war</bundleFileName>
                         </webModule>
                         <webModule>
diff --git a/enterprise-war-for-ear/pom.xml b/enterprise-war-for-ear/pom.xml
new file mode 100644
index 0000000000..1db7e2b636
--- /dev/null
+++ b/enterprise-war-for-ear/pom.xml
@@ -0,0 +1,57 @@
+<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>alfresco-enterprise-war-for-ear</artifactId>
+    <name>Alfresco Enterprise WAR for inclusion in EAR</name>
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>alfresco-full-installation</artifactId>
+        <version>2015-SNAPSHOT</version>
+    </parent>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-platform-enterprise</artifactId>
+            <version>${alfresco.platform.version}</version>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-share-services</artifactId>
+            <version>${alfresco.share.version}</version>
+            <type>amp</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>alfresco</finalName>
+        <plugins>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <!-- Add dependency to alfresco-maven-plugin, to allow AMP overlays -->
+                <dependencies>
+                    <dependency>
+                        <groupId>org.alfresco.maven.plugin</groupId>
+                        <artifactId>alfresco-maven-plugin</artifactId>
+                        <version>2.1.1</version>
+                    </dependency>
+                </dependencies>
+                <configuration>
+                    <overlays>
+                        <overlay>
+                            <groupId>org.alfresco</groupId>
+                            <artifactId>alfresco-platform-enterprise</artifactId>
+                            <type>war</type>
+                        </overlay>
+                        <overlay>
+                            <groupId>org.alfresco</groupId>
+                            <artifactId>alfresco-share-services</artifactId>
+                            <type>amp</type>
+                        </overlay>
+                    </overlays>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/pom.xml b/pom.xml
index 1df1ff47d9..5a1aa4b6c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,7 @@
         <profile>
             <id>enterprise</id>
             <modules>
+                <module>enterprise-war-for-ear</module>
                 <module>ear</module>
                 <module>enterprise-distribution</module>
                 <module>enterprise-update</module>

From 6f17189760f1fd18188fb4e3272e93ba40eedbd6 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Tue, 8 Mar 2016 14:36:32 +0000
Subject: [PATCH 02/15] Created 5.2.N branch from 5.1.N r123236

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123242 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

From 16211f4973c0facdcb0d9f5c782a3270c3bcdf74 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Tue, 8 Mar 2016 15:14:51 +0000
Subject: [PATCH 03/15] Increment version to 5.2.1-SNAPSHOT

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123249 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 distribution/pom.xml            | 2 +-
 ear/pom.xml                     | 2 +-
 enterprise-distribution/pom.xml | 2 +-
 enterprise-installer/pom.xml    | 2 +-
 enterprise-update/pom.xml       | 2 +-
 installer/pom.xml               | 2 +-
 pom.xml                         | 2 +-
 public-javadoc/pom.xml          | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index a5bbdfe065..14c824b05b 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-full-installation</artifactId>
-        <version>5.1.0</version>
+        <version>5.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>alfresco-community-distribution</artifactId>
     <packaging>jar</packaging>
diff --git a/ear/pom.xml b/ear/pom.xml
index db5e8f95b7..18540e7ce5 100644
--- a/ear/pom.xml
+++ b/ear/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-full-installation</artifactId>
-        <version>5.1.0</version>
+        <version>5.2.1-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
 
diff --git a/enterprise-distribution/pom.xml b/enterprise-distribution/pom.xml
index 91c952356f..f5921103b1 100644
--- a/enterprise-distribution/pom.xml
+++ b/enterprise-distribution/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-full-installation</artifactId>
-        <version>5.1.0</version>
+        <version>5.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>alfresco-one-distribution</artifactId>
     <packaging>jar</packaging>
diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml
index b1a236b023..072072c834 100644
--- a/enterprise-installer/pom.xml
+++ b/enterprise-installer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-full-installation</artifactId>
-        <version>5.1.0</version>
+        <version>5.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>alfresco-one-installer</artifactId>
     <packaging>pom</packaging>
diff --git a/enterprise-update/pom.xml b/enterprise-update/pom.xml
index 0cc39f4390..b0437b988c 100644
--- a/enterprise-update/pom.xml
+++ b/enterprise-update/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-full-installation</artifactId>
-        <version>5.1.0</version>
+        <version>5.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>alfresco-enterprise-update-package</artifactId>
     <packaging>jar</packaging>
diff --git a/installer/pom.xml b/installer/pom.xml
index 1ec9d975f5..5691a0dcc7 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-full-installation</artifactId>
-        <version>5.1.0</version>
+        <version>5.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>alfresco-community-installer</artifactId>
     <packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index dff4dbdb2e..8b05f0a538 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
         <version>6</version>
     </parent>
     <artifactId>alfresco-full-installation</artifactId>
-    <version>5.1.1-SNAPSHOT</version>
+    <version>5.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Full Installation</name>
 
diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml
index 6be901a826..b9057533cb 100644
--- a/public-javadoc/pom.xml
+++ b/public-javadoc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-full-installation</artifactId>
-        <version>5.1.0</version>
+        <version>5.2.1-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
 

From a200580acb1f5159aee7bbdd4d73da07be976ca2 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Tue, 8 Mar 2016 15:23:50 +0000
Subject: [PATCH 04/15] Use 5.2.1-SNAPSHOT of PLAT and SHARE

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123254 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8b05f0a538..04038b394b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,10 +13,10 @@
 
     <properties>
         <!-- Alfresco Platform version -->
-        <alfresco.platform.version>5.1.1-SNAPSHOT</alfresco.platform.version>
+        <alfresco.platform.version>5.2.1-SNAPSHOT</alfresco.platform.version>
 
         <!-- Alfresco Share version -->
-        <alfresco.share.version>5.1.1-SNAPSHOT</alfresco.share.version>
+        <alfresco.share.version>5.2.1-SNAPSHOT</alfresco.share.version>
 
         <!-- Alfresco GoogleDocs integration version -->
         <alfresco.googledocs.version>3.0.3</alfresco.googledocs.version>

From 06630a8d8af35f51796fdd966809c7bdd1c38afc Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Thu, 10 Mar 2016 10:23:18 +0000
Subject: [PATCH 05/15] Update dependencies for 5.2

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123416 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5a1aa4b6c2..a72e860db8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,16 +7,16 @@
         <version>6</version>
     </parent>
     <artifactId>alfresco-full-installation</artifactId>
-    <version>2015-SNAPSHOT</version>
+    <version>5.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Full Installation</name>
 
     <properties>
         <!-- Alfresco Platform version -->
-        <alfresco.platform.version>5.1-SNAPSHOT</alfresco.platform.version>
+        <alfresco.platform.version>5.2-SNAPSHOT</alfresco.platform.version>
 
         <!-- Alfresco Share version -->
-        <alfresco.share.version>5.1-SNAPSHOT</alfresco.share.version>
+        <alfresco.share.version>5.2-SNAPSHOT</alfresco.share.version>
 
         <!-- Alfresco GoogleDocs integration version -->
         <alfresco.googledocs.version>3.0.3</alfresco.googledocs.version>

From 9d8ece6518283de1a1b286ddb6f7106b55f7c997 Mon Sep 17 00:00:00 2001
From: Samuel Langlois <samuel.langlois@alfresco.com>
Date: Fri, 11 Mar 2016 11:22:36 +0000
Subject: [PATCH 06/15] Update dependencies for 5.2 - fix sub-poms

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123522 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 distribution/pom.xml            | 2 +-
 ear/pom.xml                     | 2 +-
 enterprise-distribution/pom.xml | 2 +-
 enterprise-installer/pom.xml    | 2 +-
 enterprise-update/pom.xml       | 2 +-
 enterprise-war-for-ear/pom.xml  | 2 +-
 installer/pom.xml               | 2 +-
 public-javadoc/pom.xml          | 2 +-
 share-po-run/pom.xml            | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 13cc319172..5d824b869a 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-full-installation</artifactId>
-        <version>2015-SNAPSHOT</version>
+        <version>5.2-SNAPSHOT</version>
     </parent>
     <artifactId>alfresco-community-distribution</artifactId>
     <packaging>jar</packaging>
diff --git a/ear/pom.xml b/ear/pom.xml
index 511d11ae07..534694d749 100644
--- a/ear/pom.xml
+++ b/ear/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-full-installation</artifactId>
-        <version>2015-SNAPSHOT</version>
+        <version>5.2-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
 
diff --git a/enterprise-distribution/pom.xml b/enterprise-distribution/pom.xml
index 6aa0bfe346..918910c78b 100644
--- a/enterprise-distribution/pom.xml
+++ b/enterprise-distribution/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-full-installation</artifactId>
-        <version>2015-SNAPSHOT</version>
+        <version>5.2-SNAPSHOT</version>
     </parent>
     <artifactId>alfresco-one-distribution</artifactId>
     <packaging>jar</packaging>
diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml
index 5643a35091..c0c60d57e9 100644
--- a/enterprise-installer/pom.xml
+++ b/enterprise-installer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-full-installation</artifactId>
-        <version>2015-SNAPSHOT</version>
+        <version>5.2-SNAPSHOT</version>
     </parent>
     <artifactId>alfresco-one-installer</artifactId>
     <packaging>pom</packaging>
diff --git a/enterprise-update/pom.xml b/enterprise-update/pom.xml
index b78b1fb0bb..fd472a3d77 100644
--- a/enterprise-update/pom.xml
+++ b/enterprise-update/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-full-installation</artifactId>
-        <version>2015-SNAPSHOT</version>
+        <version>5.2-SNAPSHOT</version>
     </parent>
     <artifactId>alfresco-enterprise-update-package</artifactId>
     <packaging>jar</packaging>
diff --git a/enterprise-war-for-ear/pom.xml b/enterprise-war-for-ear/pom.xml
index 1db7e2b636..36d2fc1789 100644
--- a/enterprise-war-for-ear/pom.xml
+++ b/enterprise-war-for-ear/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-full-installation</artifactId>
-        <version>2015-SNAPSHOT</version>
+        <version>5.2-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
 
diff --git a/installer/pom.xml b/installer/pom.xml
index 24babd4420..6ccdb88a73 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-full-installation</artifactId>
-        <version>2015-SNAPSHOT</version>
+        <version>5.2-SNAPSHOT</version>
     </parent>
     <artifactId>alfresco-community-installer</artifactId>
     <packaging>pom</packaging>
diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml
index fe8a9338b9..56d7f01425 100644
--- a/public-javadoc/pom.xml
+++ b/public-javadoc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-full-installation</artifactId>
-        <version>2015-SNAPSHOT</version>
+        <version>5.2-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
 
diff --git a/share-po-run/pom.xml b/share-po-run/pom.xml
index a1a46a989e..1b122f9060 100644
--- a/share-po-run/pom.xml
+++ b/share-po-run/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-full-installation</artifactId>
-        <version>2015-SNAPSHOT</version>
+        <version>5.2-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
 

From 2b832a6257cd8aadb58156d7c7e243269c47ec62 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 12 Mar 2016 14:41:50 +0000
Subject: [PATCH 07/15] Merged 5.2.N (5.2.1) to trunk (5.2)    123005
 slanglois: Specify installer.version.name when calling Ant to build
 installers (so we can override it on the command line)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123843 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 enterprise-installer/pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml
index c0c60d57e9..8f37a491fa 100644
--- a/enterprise-installer/pom.xml
+++ b/enterprise-installer/pom.xml
@@ -176,7 +176,9 @@
                         <configuration>
                             <workingDirectory>${project.build.directory}/classes/bitrock</workingDirectory>
                             <target>
-                                <ant antfile="${project.build.directory}/classes/build-installers.xml" />
+                                <ant antfile="${project.build.directory}/classes/build-installers.xml">
+				    <property name="installer.version.name" value="${installer.version.name}" />
+                                </ant>
                             </target>
                         </configuration>
                     </execution>

From c7d061ed8ca14f17770f6ec26775c45573cec780 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 12 Mar 2016 14:43:10 +0000
Subject: [PATCH 08/15] Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :   
 - 123195

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123844 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

From bb1fc8eaeabcfc656623c5d33fe43f8ef3849593 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 12 Mar 2016 14:43:43 +0000
Subject: [PATCH 09/15] Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :   
 - 123250,123251,123253

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123845 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

From 4f73093ffb4f76e30d78524500f72a8c3a7eebb6 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 12 Mar 2016 14:45:34 +0000
Subject: [PATCH 10/15] Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :   
 - 123254

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123846 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

From 7bdbe2ce6b6da2c0b743827798266a3781064f56 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 12 Mar 2016 14:47:06 +0000
Subject: [PATCH 11/15] Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :   
 - 123839

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123847 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

From cef56ed81e07216c785a468f24ac946f846ab776 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 12 Mar 2016 14:50:48 +0000
Subject: [PATCH 12/15] Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :
 123235-123236,123242,123249,123838

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123848 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

From d074bd9f0160251acfa51870d00609b88a9e6a5b Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 12 Mar 2016 14:56:36 +0000
Subject: [PATCH 13/15] remove nested merginfo

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

From 9a6aa35c8782f9b76ce8f2b38986e079344d727e Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 12 Mar 2016 14:57:18 +0000
Subject: [PATCH 14/15] remove nested merginfo

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123852 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

From d84cb7685bfc1a558c84ba3a017705b0014489bc Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 12 Mar 2016 15:02:35 +0000
Subject: [PATCH 15/15] Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :   
 - 123851,123854

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123855 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261