diff --git a/config/alfresco/bootstrap/notification/wf-email.html_de.ftl b/config/alfresco/bootstrap/notification/wf-email.html_de.ftl
index be399b66fd..76941c23e5 100644
--- a/config/alfresco/bootstrap/notification/wf-email.html_de.ftl
+++ b/config/alfresco/bootstrap/notification/wf-email.html_de.ftl
@@ -1,4 +1,4 @@
-﻿<html>
+<html>
    <head>
       <style type="text/css"><!--
       body
diff --git a/config/alfresco/bootstrap/notification/wf-email.html_es.ftl b/config/alfresco/bootstrap/notification/wf-email.html_es.ftl
index bd346d1951..039a071a50 100644
--- a/config/alfresco/bootstrap/notification/wf-email.html_es.ftl
+++ b/config/alfresco/bootstrap/notification/wf-email.html_es.ftl
@@ -1,4 +1,4 @@
-﻿<html>
+<html>
    <head>
       <style type="text/css"><!--
       body
diff --git a/config/alfresco/bootstrap/notification/wf-email.html_fr.ftl b/config/alfresco/bootstrap/notification/wf-email.html_fr.ftl
index 550931b4f9..f95be889ac 100644
--- a/config/alfresco/bootstrap/notification/wf-email.html_fr.ftl
+++ b/config/alfresco/bootstrap/notification/wf-email.html_fr.ftl
@@ -1,4 +1,4 @@
-﻿<html>
+<html>
    <head>
       <style type="text/css"><!--
       body
diff --git a/config/alfresco/bootstrap/notification/wf-email.html_it.ftl b/config/alfresco/bootstrap/notification/wf-email.html_it.ftl
index f4bb726ac1..b92b450f2d 100644
--- a/config/alfresco/bootstrap/notification/wf-email.html_it.ftl
+++ b/config/alfresco/bootstrap/notification/wf-email.html_it.ftl
@@ -1,4 +1,4 @@
-﻿<html>
+<html>
    <head>
       <style type="text/css"><!--
       body
diff --git a/config/alfresco/bootstrap/notification/wf-email.html_ja.ftl b/config/alfresco/bootstrap/notification/wf-email.html_ja.ftl
index 863849f051..cb0aff3762 100644
--- a/config/alfresco/bootstrap/notification/wf-email.html_ja.ftl
+++ b/config/alfresco/bootstrap/notification/wf-email.html_ja.ftl
@@ -1,4 +1,4 @@
-﻿<html>
+<html>
    <head>
       <style type="text/css"><!--
       body
diff --git a/config/alfresco/bootstrap/notification/workflow-email-notification.xml b/config/alfresco/bootstrap/notification/workflow-email-notification.xml
index 3efe544e50..6178de4a89 100644
--- a/config/alfresco/bootstrap/notification/workflow-email-notification.xml
+++ b/config/alfresco/bootstrap/notification/workflow-email-notification.xml
@@ -33,7 +33,7 @@
                         <cm:content>contentUrl=classpath:alfresco\bootstrap\notification\wf-email.html.ftl|mimetype=text/plain|encoding=UTF-8</cm:content>
                     </view:properties>
                 </cm:content>
-                <cm:content view:childName="cm:invite-email.html_de.ftl">
+                <cm:content view:childName="cm:invite-email_de.html.ftl">
                     <view:aspects>
                         <cm:auditable></cm:auditable>
                         <sys:referenceable></sys:referenceable>
@@ -42,13 +42,13 @@
                     <view:acl></view:acl>
                     <view:properties>
                         <app:editInline>true</app:editInline>	  
-                        <cm:name>wf-email.html_de.ftl</cm:name>
-                        <cm:title>wf-email.html_de.ftl</cm:title>
+                        <cm:name>wf-email_de.html.ftl</cm:name>
+                        <cm:title>wf-email_de.html.ftl</cm:title>
                         <cm:description>${spaces.templates.email.generate_the_wf_notification_email.description} - ${version.default}</cm:description>
                         <cm:content>contentUrl=classpath:alfresco\bootstrap\notification\wf-email.html_de.ftl|mimetype=text/plain|encoding=UTF-8</cm:content>
                     </view:properties>
                 </cm:content>
-                <cm:content view:childName="cm:invite-email.html_es.ftl">
+                <cm:content view:childName="cm:invite-email_es.html.ftl">
                     <view:aspects>
                         <cm:auditable></cm:auditable>
                         <sys:referenceable></sys:referenceable>
@@ -57,13 +57,13 @@
                     <view:acl></view:acl>
                     <view:properties>
                         <app:editInline>true</app:editInline>	  
-                        <cm:name>wf-email.html_es.ftl</cm:name>
-                        <cm:title>wf-email.html_es.ftl</cm:title>
+                        <cm:name>wf-email_es.html.ftl</cm:name>
+                        <cm:title>wf-email_es.html.ftl</cm:title>
                         <cm:description>${spaces.templates.email.generate_the_wf_notification_email.description} - ${version.default}</cm:description>
                         <cm:content>contentUrl=classpath:alfresco\bootstrap\notification\wf-email.html_es.ftl|mimetype=text/plain|encoding=UTF-8</cm:content>
                     </view:properties>
                 </cm:content>
-                <cm:content view:childName="cm:invite-email.html_fr.ftl">
+                <cm:content view:childName="cm:invite-email_fr.html.ftl">
                     <view:aspects>
                         <cm:auditable></cm:auditable>
                         <sys:referenceable></sys:referenceable>
@@ -72,13 +72,13 @@
                     <view:acl></view:acl>
                     <view:properties>
                         <app:editInline>true</app:editInline>	  
-                        <cm:name>wf-email.html_fr.ftl</cm:name>
-                        <cm:title>wf-email.html_fr.ftl</cm:title>
+                        <cm:name>wf-email_fr.html.ftl</cm:name>
+                        <cm:title>wf-email_fr.html.ftl</cm:title>
                         <cm:description>${spaces.templates.email.generate_the_wf_notification_email.description} - ${version.default}</cm:description>
                         <cm:content>contentUrl=classpath:alfresco\bootstrap\notification\wf-email.html_fr.ftl|mimetype=text/plain|encoding=UTF-8</cm:content>
                     </view:properties>
                 </cm:content>
-                <cm:content view:childName="cm:invite-email.html_it.ftl">
+                <cm:content view:childName="cm:invite-email_it.html.ftl">
                     <view:aspects>
                         <cm:auditable></cm:auditable>
                         <sys:referenceable></sys:referenceable>
@@ -87,13 +87,13 @@
                     <view:acl></view:acl>
                     <view:properties>
                         <app:editInline>true</app:editInline>	  
-                        <cm:name>wf-email.html_it.ftl</cm:name>
-                        <cm:title>wf-email.html_it.ftl</cm:title>
+                        <cm:name>wf-email_it.html.ftl</cm:name>
+                        <cm:title>wf-email_it.html.ftl</cm:title>
                         <cm:description>${spaces.templates.email.generate_the_wf_notification_email.description} - ${version.default}</cm:description>
                         <cm:content>contentUrl=classpath:alfresco\bootstrap\notification\wf-email.html_it.ftl|mimetype=text/plain|encoding=UTF-8</cm:content>
                     </view:properties>
                 </cm:content>
-                <cm:content view:childName="cm:invite-email.html_ja.ftl">
+                <cm:content view:childName="cm:invite-email_ja.html.ftl">
                     <view:aspects>
                         <cm:auditable></cm:auditable>
                         <sys:referenceable></sys:referenceable>
@@ -102,13 +102,13 @@
                     <view:acl></view:acl>
                     <view:properties>
                         <app:editInline>true</app:editInline>	  
-                        <cm:name>wf-email.html_ja.ftl</cm:name>
-                        <cm:title>wf-email.html_ja.ftl</cm:title>
+                        <cm:name>wf-email_ja.html.ftl</cm:name>
+                        <cm:title>wf-email_ja.html.ftl</cm:title>
                         <cm:description>${spaces.templates.email.generate_the_wf_notification_email.description} - ${version.default}</cm:description>
                         <cm:content>contentUrl=classpath:alfresco\bootstrap\notification\wf-email.html_ja.ftl|mimetype=text/plain|encoding=UTF-8</cm:content>
                     </view:properties>
                 </cm:content>
-                <cm:content view:childName="cm:wf-email.html_nl.ftl">
+                <cm:content view:childName="cm:wf-email_nl.html.ftl">
                     <view:aspects>
                         <cm:auditable></cm:auditable>
                         <sys:referenceable></sys:referenceable>
@@ -117,8 +117,8 @@
                     <view:acl></view:acl>
                     <view:properties>
                         <app:editInline>true</app:editInline>	  
-                        <cm:name>wf-email.html_nl.ftl</cm:name>
-                        <cm:title>wf-email.html_nl.ftl</cm:title>
+                        <cm:name>wf-email_nl.html.ftl</cm:name>
+                        <cm:title>wf-email_nl.html.ftl</cm:title>
                         <cm:description>${spaces.templates.email.generate_the_wf_notification_email.description} - ${version.default}</cm:description>
                         <cm:content>contentUrl=classpath:alfresco\bootstrap\notification\wf-email.html_nl.ftl|mimetype=text/plain|encoding=UTF-8</cm:content>
                     </view:properties>
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
index 1f1e7b0e00..dfc15749a0 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
@@ -927,6 +927,7 @@
 
     <sql id="select_ChildAssoc_OrderBy">
         order by
+            assoc.assoc_index ASC,
             assoc.id ASC
     </sql>
     <sql id="select_ChildAssocsOfParent_Query">
diff --git a/config/alfresco/messages/bootstrap-spaces_de.properties b/config/alfresco/messages/bootstrap-spaces_de.properties
index ae89a1a9b9..f4bb9fc99b 100755
--- a/config/alfresco/messages/bootstrap-spaces_de.properties
+++ b/config/alfresco/messages/bootstrap-spaces_de.properties
@@ -45,12 +45,18 @@ spaces.actions.scheduled_actions.description=Ablaufplan f\u00fcr st\u00e4ndig au
 spaces.publishing.root.name=Ver\u00f6ffentlichung Root
 spaces.publishing.root.description=Root-Ordner f\u00fcr Ver\u00f6ffentlichungsdienst.
 
+spaces.remote_credentials.root.name=Remote-Anmeldedaten
+spaces.remote_credentials.root.description=Root-Ordner f\u00fcr freigegebene Remote-Anmeldedaten
+
 spaces.rendition.rendering_actions.name=Arbeitsbereich f\u00fcr Renderingaktionen
 spaces.rendition.rendering_actions.description=Ein von dem System verwendeter Arbeitsbereich zur Umsetzung von Rendering-Aktionen.
 
 spaces.replication.replication_actions.name=Arbeitsbereich f\u00fcr Replikationsaktionen
 spaces.replication.replication_actions.description=Ein von dem System verwendeter Arbeitsbereich zur Umsetzung von Replikations-Aktionen.
 
+spaces.syncset_definitions.root.name=SyncSet-Definitionen
+spaces.syncset_definitions.root.description=Root-Ordner f\u00fcr SyncSet-Definitionen
+
 spaces.savedsearches.name=Gespeicherte Suchen
 spaces.savedsearches.description=Gespeicherte Suchen
 
diff --git a/config/alfresco/messages/bootstrap-spaces_es.properties b/config/alfresco/messages/bootstrap-spaces_es.properties
index 024339c53c..909d7e75c9 100755
--- a/config/alfresco/messages/bootstrap-spaces_es.properties
+++ b/config/alfresco/messages/bootstrap-spaces_es.properties
@@ -45,12 +45,18 @@ spaces.actions.scheduled_actions.description=Programaci\u00f3n de cu\u00e1ndo se
 spaces.publishing.root.name=Ra\u00edz de publicaci\u00f3n
 spaces.publishing.root.description=Carpeta ra\u00edz para el servicio de publicaci\u00f3n.
 
+spaces.remote_credentials.root.name=Credenciales remotas
+spaces.remote_credentials.root.description=Carpeta ra\u00edz para las credenciales remotas compartidas
+
 spaces.rendition.rendering_actions.name=Espacio de renderizaci\u00f3n de acciones
 spaces.rendition.rendering_actions.description=Un espacio utilizado por el sistema para la persistencia de acciones de renderizaci\u00f3n.
 
 spaces.replication.replication_actions.name=Espacio de replicaci\u00f3n de acciones
 spaces.replication.replication_actions.description=Un espacio utilizado por el sistema para la persistencia de acciones de replicaci\u00f3n.
 
+spaces.syncset_definitions.root.name=Definiciones de SyncSet
+spaces.syncset_definitions.root.description=Carpeta ra\u00edz para las definiciones de SyncSet
+
 spaces.savedsearches.name=B\u00fasquedas guardadas
 spaces.savedsearches.description=B\u00fasquedas guardadas
 
diff --git a/config/alfresco/messages/bootstrap-spaces_fr.properties b/config/alfresco/messages/bootstrap-spaces_fr.properties
index f8a09129d0..d0e797dee8 100755
--- a/config/alfresco/messages/bootstrap-spaces_fr.properties
+++ b/config/alfresco/messages/bootstrap-spaces_fr.properties
@@ -45,6 +45,9 @@ spaces.actions.scheduled_actions.description=Planning d'ex\u00e9cution des actio
 spaces.publishing.root.name=Racine de publication
 spaces.publishing.root.description=Dossier racine associ\u00e9 au service de publication.
 
+spaces.remote_credentials.root.name=Identifiants distants
+spaces.remote_credentials.root.description=Espace racine pour les identifiants distants partag\u00e9s
+
 spaces.rendition.rendering_actions.name=Espace d'actions de rendu
 spaces.rendition.rendering_actions.description=Espace utilis\u00e9 par le syst\u00e8me afin de faire persister les actions de rendu.
 
@@ -54,6 +57,9 @@ spaces.replication.replication_actions.description=Espace utilis\u00e9 par le sy
 spaces.savedsearches.name=Recherches enregistr\u00e9es
 spaces.savedsearches.description=Recherches enregistr\u00e9es
 
+spaces.syncset_definitions.root.name=D\u00e9finitions SyncSet
+spaces.syncset_definitions.root.description=Espace racine pour les d\u00e9finitions SyncSet
+
 spaces.guest_home.name=Espace invit\u00e9
 spaces.guest_home.description=Espace racine de l'invit\u00e9
 
diff --git a/config/alfresco/messages/bootstrap-spaces_it.properties b/config/alfresco/messages/bootstrap-spaces_it.properties
index 7eab3101c2..fc42e469c5 100755
--- a/config/alfresco/messages/bootstrap-spaces_it.properties
+++ b/config/alfresco/messages/bootstrap-spaces_it.properties
@@ -45,12 +45,18 @@ spaces.actions.scheduled_actions.description=Programma relativo all'esecuzione d
 spaces.publishing.root.name=Radice di pubblicazione
 spaces.publishing.root.description=Cartella radice per PublishingService.
 
+spaces.remote_credentials.root.name=Credenziali remote
+spaces.remote_credentials.root.description=Cartella radice per le Credenziali Remote Condivise
+
 spaces.rendition.rendering_actions.name=Spazio delle azioni di rendering
 spaces.rendition.rendering_actions.description=Spazio utilizzato dal sistema per salvare le azioni di rendering.
 
 spaces.replication.replication_actions.name=Spazio delle azioni di replica
 spaces.replication.replication_actions.description=Spazio utilizzato dal sistema per salvare le azioni di replica.
 
+spaces.syncset_definitions.root.name=Definizioni SyncSet
+spaces.syncset_definitions.root.description=Cartella radice per SyncSet
+
 spaces.savedsearches.name=Ricerche salvate
 spaces.savedsearches.description=Ricerche salvate
 
diff --git a/config/alfresco/messages/bootstrap-spaces_ja.properties b/config/alfresco/messages/bootstrap-spaces_ja.properties
index b2df6ffc23..7acf5c1842 100755
--- a/config/alfresco/messages/bootstrap-spaces_ja.properties
+++ b/config/alfresco/messages/bootstrap-spaces_ja.properties
@@ -45,12 +45,18 @@ spaces.actions.scheduled_actions.description=\u6c38\u7d9a\u7684\u306a\u30a2\u30a
 spaces.publishing.root.name=\u516c\u958b\u30eb\u30fc\u30c8
 spaces.publishing.root.description=PublishingService\u306e\u30eb\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u3067\u3059\u3002
 
+spaces.remote_credentials.root.name=\u30ea\u30e2\u30fc\u30c8\u8cc7\u683c\u60c5\u5831
+spaces.remote_credentials.root.description=\u5171\u6709\u3057\u3066\u3044\u308b\u30ea\u30e2\u30fc\u30c8\u8cc7\u683c\u60c5\u5831\u306e\u30eb\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0
+
 spaces.rendition.rendering_actions.name=\u30ec\u30f3\u30c0\u30ea\u30f3\u30b0\u30a2\u30af\u30b7\u30e7\u30f3\u30b9\u30da\u30fc\u30b9
 spaces.rendition.rendering_actions.description=\u30ec\u30f3\u30c0\u30ea\u30f3\u30b0\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u6c38\u7d9a\u3055\u305b\u308b\u305f\u3081\u306b\u30b7\u30b9\u30c6\u30e0\u304c\u4f7f\u7528\u3059\u308b\u30b9\u30da\u30fc\u30b9\u3002
 
 spaces.replication.replication_actions.name=\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30a2\u30af\u30b7\u30e7\u30f3\u30b9\u30da\u30fc\u30b9
 spaces.replication.replication_actions.description=\u30ec\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u6c38\u7d9a\u3055\u305b\u308b\u305f\u3081\u306b\u30b7\u30b9\u30c6\u30e0\u304c\u4f7f\u7528\u3059\u308b\u30b9\u30da\u30fc\u30b9\u3002
 
+spaces.syncset_definitions.root.name=SyncSet\u5b9a\u7fa9
+spaces.syncset_definitions.root.description=SyncSet\u5b9a\u7fa9\u306e\u30eb\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0
+
 spaces.savedsearches.name=\u4fdd\u5b58\u3057\u305f\u691c\u7d22\u30ad\u30fc\u30ef\u30fc\u30c9
 spaces.savedsearches.description=\u4fdd\u5b58\u3057\u305f\u691c\u7d22\u30ad\u30fc\u30ef\u30fc\u30c9
 
diff --git a/config/alfresco/messages/bootstrap-spaces_nl.properties b/config/alfresco/messages/bootstrap-spaces_nl.properties
index acdaf5fd98..4da207f40e 100755
--- a/config/alfresco/messages/bootstrap-spaces_nl.properties
+++ b/config/alfresco/messages/bootstrap-spaces_nl.properties
@@ -45,12 +45,18 @@ spaces.actions.scheduled_actions.description=Schema van wanneer persistente acti
 spaces.publishing.root.name=Publicatiehoofdmap
 spaces.publishing.root.description=Hoofdmap voor de publicatieservice.
 
+spaces.remote_credentials.root.name=Externe-verificatiegegevens
+spaces.remote_credentials.root.description=Hoofdmap voor gedeelde externe-verificatiegegevens
+
 spaces.rendition.rendering_actions.name=Ruimte voor genereren van acties
 spaces.rendition.rendering_actions.description=Een ruimte die door het systeem wordt gebruikt om door te gaan met het genereren van acties.
 
 spaces.replication.replication_actions.name=Ruimte voor repliceren van acties
 spaces.replication.replication_actions.description=Een ruimte die door het systeem wordt gebruikt om door te gaan met het repliceren van acties.
 
+spaces.syncset_definitions.root.name=SyncSet-definities
+spaces.syncset_definitions.root.description=Hoofdmap voor SyncSet-definities
+
 spaces.savedsearches.name=Opgeslagen zoekacties
 spaces.savedsearches.description=Opgeslagen zoekacties
 
diff --git a/config/alfresco/messages/patch-service_de.properties b/config/alfresco/messages/patch-service_de.properties
index fbd1ffe5bd..ca54d72ba8 100755
--- a/config/alfresco/messages/patch-service_de.properties
+++ b/config/alfresco/messages/patch-service_de.properties
@@ -153,6 +153,7 @@ patch.siteLoadPatch.exists=The Site {0} already exists and so could not be impor
 patch.siteLoadPatch.noBootstrapViews=No bootstrap views were given for importing Site {0} - please check the bootstrap extension bean configuration
 patch.siteLoadPatch.result=Site {0} imported.
 patch.siteLoadPatch.siteNotCreated=The site {0} is only created for new installs.
+patch.siteLoadPatch.siteLoadDisabled=The load of site {0} is disabled.
 
 patch.wcmFolders.description=Ensures the existance of the WCM specific 'Web Projects' and 'Web Forms' folders.
 patch.wcmFolders.webprojects.result.exists=The Web Projects folder already exists: {0}
@@ -463,3 +464,9 @@ patch.avmIndexChildEntriesLower.description=Add an indexed column to avm_child_e
 
 patch.imapUnsubscribedAspect.description=Patch to remove deprecated "imap:nonSubscribed" aspect from folders.
 patch.imapUnsubscribedAspect.result.removed="imap:nonSubscribed" aspect was successfully removed from unsubscribed folders.
+
+patch.migrateTenantsFromAttrsToTable.description=Migrate Tenant attributes to Tenant table
+patch.migrateTenantsFromAttrsToTable.result=Processed {0} tenants
+
+patch.remoteCredentialsContainer.description=Patch to add the root folder for Shared Remote Credentials
+patch.syncSetDefinitionsContainer.description=Patch to add the root folder for SyncSet Definitions
diff --git a/config/alfresco/messages/patch-service_es.properties b/config/alfresco/messages/patch-service_es.properties
index fbd1ffe5bd..ca54d72ba8 100755
--- a/config/alfresco/messages/patch-service_es.properties
+++ b/config/alfresco/messages/patch-service_es.properties
@@ -153,6 +153,7 @@ patch.siteLoadPatch.exists=The Site {0} already exists and so could not be impor
 patch.siteLoadPatch.noBootstrapViews=No bootstrap views were given for importing Site {0} - please check the bootstrap extension bean configuration
 patch.siteLoadPatch.result=Site {0} imported.
 patch.siteLoadPatch.siteNotCreated=The site {0} is only created for new installs.
+patch.siteLoadPatch.siteLoadDisabled=The load of site {0} is disabled.
 
 patch.wcmFolders.description=Ensures the existance of the WCM specific 'Web Projects' and 'Web Forms' folders.
 patch.wcmFolders.webprojects.result.exists=The Web Projects folder already exists: {0}
@@ -463,3 +464,9 @@ patch.avmIndexChildEntriesLower.description=Add an indexed column to avm_child_e
 
 patch.imapUnsubscribedAspect.description=Patch to remove deprecated "imap:nonSubscribed" aspect from folders.
 patch.imapUnsubscribedAspect.result.removed="imap:nonSubscribed" aspect was successfully removed from unsubscribed folders.
+
+patch.migrateTenantsFromAttrsToTable.description=Migrate Tenant attributes to Tenant table
+patch.migrateTenantsFromAttrsToTable.result=Processed {0} tenants
+
+patch.remoteCredentialsContainer.description=Patch to add the root folder for Shared Remote Credentials
+patch.syncSetDefinitionsContainer.description=Patch to add the root folder for SyncSet Definitions
diff --git a/config/alfresco/messages/patch-service_fr.properties b/config/alfresco/messages/patch-service_fr.properties
index fbd1ffe5bd..ca54d72ba8 100755
--- a/config/alfresco/messages/patch-service_fr.properties
+++ b/config/alfresco/messages/patch-service_fr.properties
@@ -153,6 +153,7 @@ patch.siteLoadPatch.exists=The Site {0} already exists and so could not be impor
 patch.siteLoadPatch.noBootstrapViews=No bootstrap views were given for importing Site {0} - please check the bootstrap extension bean configuration
 patch.siteLoadPatch.result=Site {0} imported.
 patch.siteLoadPatch.siteNotCreated=The site {0} is only created for new installs.
+patch.siteLoadPatch.siteLoadDisabled=The load of site {0} is disabled.
 
 patch.wcmFolders.description=Ensures the existance of the WCM specific 'Web Projects' and 'Web Forms' folders.
 patch.wcmFolders.webprojects.result.exists=The Web Projects folder already exists: {0}
@@ -463,3 +464,9 @@ patch.avmIndexChildEntriesLower.description=Add an indexed column to avm_child_e
 
 patch.imapUnsubscribedAspect.description=Patch to remove deprecated "imap:nonSubscribed" aspect from folders.
 patch.imapUnsubscribedAspect.result.removed="imap:nonSubscribed" aspect was successfully removed from unsubscribed folders.
+
+patch.migrateTenantsFromAttrsToTable.description=Migrate Tenant attributes to Tenant table
+patch.migrateTenantsFromAttrsToTable.result=Processed {0} tenants
+
+patch.remoteCredentialsContainer.description=Patch to add the root folder for Shared Remote Credentials
+patch.syncSetDefinitionsContainer.description=Patch to add the root folder for SyncSet Definitions
diff --git a/config/alfresco/messages/patch-service_it.properties b/config/alfresco/messages/patch-service_it.properties
index fbd1ffe5bd..ca54d72ba8 100755
--- a/config/alfresco/messages/patch-service_it.properties
+++ b/config/alfresco/messages/patch-service_it.properties
@@ -153,6 +153,7 @@ patch.siteLoadPatch.exists=The Site {0} already exists and so could not be impor
 patch.siteLoadPatch.noBootstrapViews=No bootstrap views were given for importing Site {0} - please check the bootstrap extension bean configuration
 patch.siteLoadPatch.result=Site {0} imported.
 patch.siteLoadPatch.siteNotCreated=The site {0} is only created for new installs.
+patch.siteLoadPatch.siteLoadDisabled=The load of site {0} is disabled.
 
 patch.wcmFolders.description=Ensures the existance of the WCM specific 'Web Projects' and 'Web Forms' folders.
 patch.wcmFolders.webprojects.result.exists=The Web Projects folder already exists: {0}
@@ -463,3 +464,9 @@ patch.avmIndexChildEntriesLower.description=Add an indexed column to avm_child_e
 
 patch.imapUnsubscribedAspect.description=Patch to remove deprecated "imap:nonSubscribed" aspect from folders.
 patch.imapUnsubscribedAspect.result.removed="imap:nonSubscribed" aspect was successfully removed from unsubscribed folders.
+
+patch.migrateTenantsFromAttrsToTable.description=Migrate Tenant attributes to Tenant table
+patch.migrateTenantsFromAttrsToTable.result=Processed {0} tenants
+
+patch.remoteCredentialsContainer.description=Patch to add the root folder for Shared Remote Credentials
+patch.syncSetDefinitionsContainer.description=Patch to add the root folder for SyncSet Definitions
diff --git a/config/alfresco/messages/patch-service_ja.properties b/config/alfresco/messages/patch-service_ja.properties
index fbd1ffe5bd..ca54d72ba8 100755
--- a/config/alfresco/messages/patch-service_ja.properties
+++ b/config/alfresco/messages/patch-service_ja.properties
@@ -153,6 +153,7 @@ patch.siteLoadPatch.exists=The Site {0} already exists and so could not be impor
 patch.siteLoadPatch.noBootstrapViews=No bootstrap views were given for importing Site {0} - please check the bootstrap extension bean configuration
 patch.siteLoadPatch.result=Site {0} imported.
 patch.siteLoadPatch.siteNotCreated=The site {0} is only created for new installs.
+patch.siteLoadPatch.siteLoadDisabled=The load of site {0} is disabled.
 
 patch.wcmFolders.description=Ensures the existance of the WCM specific 'Web Projects' and 'Web Forms' folders.
 patch.wcmFolders.webprojects.result.exists=The Web Projects folder already exists: {0}
@@ -463,3 +464,9 @@ patch.avmIndexChildEntriesLower.description=Add an indexed column to avm_child_e
 
 patch.imapUnsubscribedAspect.description=Patch to remove deprecated "imap:nonSubscribed" aspect from folders.
 patch.imapUnsubscribedAspect.result.removed="imap:nonSubscribed" aspect was successfully removed from unsubscribed folders.
+
+patch.migrateTenantsFromAttrsToTable.description=Migrate Tenant attributes to Tenant table
+patch.migrateTenantsFromAttrsToTable.result=Processed {0} tenants
+
+patch.remoteCredentialsContainer.description=Patch to add the root folder for Shared Remote Credentials
+patch.syncSetDefinitionsContainer.description=Patch to add the root folder for SyncSet Definitions
diff --git a/config/alfresco/messages/patch-service_nl.properties b/config/alfresco/messages/patch-service_nl.properties
index fbd1ffe5bd..ca54d72ba8 100755
--- a/config/alfresco/messages/patch-service_nl.properties
+++ b/config/alfresco/messages/patch-service_nl.properties
@@ -153,6 +153,7 @@ patch.siteLoadPatch.exists=The Site {0} already exists and so could not be impor
 patch.siteLoadPatch.noBootstrapViews=No bootstrap views were given for importing Site {0} - please check the bootstrap extension bean configuration
 patch.siteLoadPatch.result=Site {0} imported.
 patch.siteLoadPatch.siteNotCreated=The site {0} is only created for new installs.
+patch.siteLoadPatch.siteLoadDisabled=The load of site {0} is disabled.
 
 patch.wcmFolders.description=Ensures the existance of the WCM specific 'Web Projects' and 'Web Forms' folders.
 patch.wcmFolders.webprojects.result.exists=The Web Projects folder already exists: {0}
@@ -463,3 +464,9 @@ patch.avmIndexChildEntriesLower.description=Add an indexed column to avm_child_e
 
 patch.imapUnsubscribedAspect.description=Patch to remove deprecated "imap:nonSubscribed" aspect from folders.
 patch.imapUnsubscribedAspect.result.removed="imap:nonSubscribed" aspect was successfully removed from unsubscribed folders.
+
+patch.migrateTenantsFromAttrsToTable.description=Migrate Tenant attributes to Tenant table
+patch.migrateTenantsFromAttrsToTable.result=Processed {0} tenants
+
+patch.remoteCredentialsContainer.description=Patch to add the root folder for Shared Remote Credentials
+patch.syncSetDefinitionsContainer.description=Patch to add the root folder for SyncSet Definitions
diff --git a/config/alfresco/subsystems/OOoDirect/default/openoffice-transform-context.xml b/config/alfresco/subsystems/OOoDirect/default/openoffice-transform-context.xml
index 0e91f76b66..eff8c4eaf7 100644
--- a/config/alfresco/subsystems/OOoDirect/default/openoffice-transform-context.xml
+++ b/config/alfresco/subsystems/OOoDirect/default/openoffice-transform-context.xml
@@ -15,37 +15,20 @@
          <value>${ooo.enabled}</value>
       </property>
    </bean>
-
-   <!--  We have to convert the user directory to an Open Office compatible URI -->
-   <bean id="userInstallationURI" class="org.alfresco.util.OpenOfficeURI">
-      <constructor-arg>
-         <value>${ooo.user}</value>
-      </constructor-arg>
-   </bean>
-
+   
    <bean id="openOfficeStartupCommand" class="org.alfresco.util.exec.RuntimeExec">
       <property name="commandsAndArguments">
-         <map>
-            <entry key=".*">
-               <list>
-                  <value>${ooo.exe}</value>
-                  <value>-accept=socket,host=127.0.0.1,port=${ooo.port};urp;StarOffice.ServiceManager</value>
-                  <bean class="org.alfresco.util.StringAppendingFactoryBean">
-                     <property name="items">
-                        <list>
-                           <value>-env:UserInstallation=</value>
-                           <ref bean="userInstallationURI" />
-                        </list>
-                     </property>
-                  </bean>
-                  <value>-nologo</value>
-                  <value>-headless</value>
-                  <value>-nofirststartwizard</value>
-                  <value>-nocrashrep</value>
-                  <value>-norestore</value>
-               </list>
-            </entry>
-         </map>
+         <bean class="org.alfresco.util.OpenOfficeCommandLine">
+            <constructor-arg>
+               <value>${ooo.exe}</value>
+            </constructor-arg>
+            <constructor-arg>
+               <value>${ooo.port}</value>
+            </constructor-arg>
+            <constructor-arg>
+               <value>${ooo.user}</value>
+            </constructor-arg>
+         </bean>
       </property>
       <property name="waitForCompletion">
          <value>false</value>
diff --git a/config/alfresco/templates/following-email-templates.xml b/config/alfresco/templates/following-email-templates.xml
index 7ad80c5f5f..7fe18b5870 100644
--- a/config/alfresco/templates/following-email-templates.xml
+++ b/config/alfresco/templates/following-email-templates.xml
@@ -24,7 +24,7 @@
             <cm:content>contentUrl=classpath:alfresco/templates/following-email-templates/following-email.html.ftl|mimetype=text/plain|size=3688|encoding=UTF-8</cm:content>
           </view:properties>
         </cm:content>
-        <cm:content view:childName="cm:following-email.html_de.ftl">
+        <cm:content view:childName="cm:following-email_de.html.ftl">
           <view:aspects>
             <cm:auditable></cm:auditable>
             <sys:referenceable></sys:referenceable>
@@ -33,13 +33,13 @@
           <view:acl></view:acl>
           <view:properties>
             <app:editInline>true</app:editInline>
-            <cm:name>following-email.html_de.ftl</cm:name>
-            <cm:title>following-email.html_de.ftl</cm:title>
+            <cm:name>following-email_de.html.ftl</cm:name>
+            <cm:title>following-email_de.html.ftl</cm:title>
             <cm:description>${email.templates.email_template_for_following_notifications} - ${version.default}</cm:description>
             <cm:content>contentUrl=classpath:alfresco/templates/following-email-templates/following-email.html_de.ftl|mimetype=text/plain|size=3688|encoding=UTF-8</cm:content>
           </view:properties>
         </cm:content>
-        <cm:content view:childName="cm:following-email.html_es.ftl">
+        <cm:content view:childName="cm:following-email_es.html.ftl">
           <view:aspects>
             <cm:auditable></cm:auditable>
             <sys:referenceable></sys:referenceable>
@@ -48,13 +48,13 @@
           <view:acl></view:acl>
           <view:properties>
             <app:editInline>true</app:editInline>
-            <cm:name>following-email.html_es.ftl</cm:name>
-            <cm:title>following-email.html_es.ftl</cm:title>
+            <cm:name>following-email_es.html.ftl</cm:name>
+            <cm:title>following-email_es.html.ftl</cm:title>
             <cm:description>${email.templates.email_template_for_following_notifications} - ${version.default}</cm:description>
             <cm:content>contentUrl=classpath:alfresco/templates/following-email-templates/following-email.html_es.ftl|mimetype=text/plain|size=3688|encoding=UTF-8</cm:content>
           </view:properties>
         </cm:content>
-        <cm:content view:childName="cm:following-email.html_fr.ftl">
+        <cm:content view:childName="cm:following-email_fr.html.ftl">
           <view:aspects>
             <cm:auditable></cm:auditable>
             <sys:referenceable></sys:referenceable>
@@ -63,13 +63,13 @@
           <view:acl></view:acl>
           <view:properties>
             <app:editInline>true</app:editInline>
-            <cm:name>following-email.html_fr.ftl</cm:name>
-            <cm:title>following-email.html_fr.ftl</cm:title>
+            <cm:name>following-email_fr.html.ftl</cm:name>
+            <cm:title>following-email_fr.html.ftl</cm:title>
             <cm:description>${email.templates.email_template_for_following_notifications} - ${version.default}</cm:description>
             <cm:content>contentUrl=classpath:alfresco/templates/following-email-templates/following-email.html_fr.ftl|mimetype=text/plain|size=3688|encoding=UTF-8</cm:content>
           </view:properties>
         </cm:content>
-        <cm:content view:childName="cm:following-email.html_it.ftl">
+        <cm:content view:childName="cm:following-email_it.html.ftl">
           <view:aspects>
             <cm:auditable></cm:auditable>
             <sys:referenceable></sys:referenceable>
@@ -78,13 +78,13 @@
           <view:acl></view:acl>
           <view:properties>
             <app:editInline>true</app:editInline>
-            <cm:name>following-email.html_it.ftl</cm:name>
-            <cm:title>following-email.html_it.ftl</cm:title>
+            <cm:name>following-email_it.html.ftl</cm:name>
+            <cm:title>following-email_it.html.ftl</cm:title>
             <cm:description>${email.templates.email_template_for_following_notifications} - ${version.default}</cm:description>
             <cm:content>contentUrl=classpath:alfresco/templates/following-email-templates/following-email.html_it.ftl|mimetype=text/plain|size=3688|encoding=UTF-8</cm:content>
           </view:properties>
         </cm:content>
-        <cm:content view:childName="cm:following-email.html_ja.ftl">
+        <cm:content view:childName="cm:following-email_ja.html.ftl">
           <view:aspects>
             <cm:auditable></cm:auditable>
             <sys:referenceable></sys:referenceable>
@@ -93,13 +93,13 @@
           <view:acl></view:acl>
           <view:properties>
             <app:editInline>true</app:editInline>
-            <cm:name>following-email.html_ja.ftl</cm:name>
-            <cm:title>following-email.html_ja.ftl</cm:title>
+            <cm:name>following-email_ja.html.ftl</cm:name>
+            <cm:title>following-email_ja.html.ftl</cm:title>
             <cm:description>${email.templates.email_template_for_following_notifications} - ${version.default}</cm:description>
             <cm:content>contentUrl=classpath:alfresco/templates/following-email-templates/following-email.html_ja.ftl|mimetype=text/plain|size=3688|encoding=UTF-8</cm:content>
           </view:properties>
         </cm:content>
-        <cm:content view:childName="cm:following-email.html_nl.ftl">
+        <cm:content view:childName="cm:following-email_nl.html.ftl">
           <view:aspects>
             <cm:auditable></cm:auditable>
             <sys:referenceable></sys:referenceable>
@@ -108,8 +108,8 @@
           <view:acl></view:acl>
           <view:properties>
             <app:editInline>true</app:editInline>
-            <cm:name>following-email.html_nl.ftl</cm:name>
-            <cm:title>following-email.html_nl.ftl</cm:title>
+            <cm:name>following-email_nl.html.ftl</cm:name>
+            <cm:title>following-email_nl.html.ftl</cm:title>
             <cm:description>${email.templates.email_template_for_following_notifications} - ${version.default}</cm:description>
             <cm:content>contentUrl=classpath:alfresco/templates/following-email-templates/following-email.html_nl.ftl|mimetype=text/plain|size=3688|encoding=UTF-8</cm:content>
           </view:properties>
diff --git a/source/java/org/alfresco/opencmis/OpenCmisLocalTest.java b/source/java/org/alfresco/opencmis/OpenCmisLocalTest.java
index 5a1618825f..a49c7ddba1 100644
--- a/source/java/org/alfresco/opencmis/OpenCmisLocalTest.java
+++ b/source/java/org/alfresco/opencmis/OpenCmisLocalTest.java
@@ -43,9 +43,9 @@ import org.apache.chemistry.opencmis.commons.SessionParameter;
 import org.apache.chemistry.opencmis.commons.enums.BindingType;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl;
+import org.apache.chemistry.opencmis.commons.impl.server.AbstractServiceFactory;
 import org.apache.chemistry.opencmis.commons.server.CallContext;
 import org.apache.chemistry.opencmis.commons.server.CmisService;
-import org.apache.chemistry.opencmis.commons.server.CmisServiceFactory;
 import org.springframework.context.ApplicationContext;
 
 /**
@@ -64,7 +64,7 @@ public class OpenCmisLocalTest extends TestCase
      * @author Derek Hulley
      * @since 4.0
      */
-    public static class TestCmisServiceFactory implements CmisServiceFactory
+    public static class TestCmisServiceFactory extends AbstractServiceFactory
     {
         private static AlfrescoCmisServiceFactory serviceFactory = (AlfrescoCmisServiceFactory) ctx.getBean("CMISServiceFactory");
         @Override
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/AVMToADMRemoteStorePatch.java b/source/java/org/alfresco/repo/admin/patch/impl/AVMToADMRemoteStorePatch.java
index 8811f8bb65..f4ac9efc6d 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/AVMToADMRemoteStorePatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/AVMToADMRemoteStorePatch.java
@@ -560,11 +560,9 @@ public class AVMToADMRemoteStorePatch extends AbstractPatch
                         // create new node and perform writer content copy of the content from the AVM to the DM store
                         FileInfo fileInfo = fileFolderService.create(
                                 parentFolder, avmNode.getName(), ContentModel.TYPE_CONTENT);
-                        Map<QName, Serializable> aspectProperties = new HashMap<QName, Serializable>(1, 1.0f);
-                        aspectProperties.put(ContentModel.PROP_IS_INDEXED, false);
-                        nodeService.addAspect(fileInfo.getNodeRef(), ContentModel.ASPECT_INDEX_CONTROL, aspectProperties);
                         ContentWriter writer = contentService.getWriter(
                                 fileInfo.getNodeRef(), ContentModel.PROP_CONTENT, true);
+                        writer.guessMimetype(fileInfo.getName());
                         writer.putContent(avmService.getContentReader(-1, avmNode.getPath()));
                     }
                     finally
@@ -577,11 +575,9 @@ public class AVMToADMRemoteStorePatch extends AbstractPatch
                     // create new node and perform writer content copy of the content from the AVM to the DM store
                     FileInfo fileInfo = fileFolderService.create(
                             parentFolder, avmNode.getName(), ContentModel.TYPE_CONTENT);
-                    Map<QName, Serializable> aspectProperties = new HashMap<QName, Serializable>(1, 1.0f);
-                    aspectProperties.put(ContentModel.PROP_IS_INDEXED, false);
-                    nodeService.addAspect(fileInfo.getNodeRef(), ContentModel.ASPECT_INDEX_CONTROL, aspectProperties);
                     ContentWriter writer = contentService.getWriter(
                             fileInfo.getNodeRef(), ContentModel.PROP_CONTENT, true);
+                    writer.guessMimetype(fileInfo.getName());
                     writer.putContent(avmService.getContentReader(-1, avmNode.getPath()));
                 }
             }
@@ -631,8 +627,8 @@ public class AVMToADMRemoteStorePatch extends AbstractPatch
                 ChildAssociationRef ref = this.nodeService.createNode(
                         rootRef, ContentModel.ASSOC_CONTAINS, assocQName, ContentModel.TYPE_FOLDER, properties);
                 surfConfigRef = ref.getChildRef();
-
-                // surf-config needs to be hidden
+                
+                // surf-config needs to be hidden - applies index control aspect as part of the hidden aspect
                 hiddenAspect.hideNode(ref.getChildRef());
             }
             catch (DuplicateChildNodeNameException dupErr)
diff --git a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java
index f15c49d75d..849dcacc24 100644
--- a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java
+++ b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java
@@ -991,17 +991,23 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol
         }
         else
         {
-            policyBehaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_AUDITABLE);
-            policyBehaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_VERSIONABLE);
-            
             checkForFlaggableAspect(nodeRef);
-
-            if(logger.isDebugEnabled())
-            {
-                logger.debug("set flag nodeRef:" + nodeRef + ",flag:" + flagToQname.get(flag) + ", value:" + value);
+            policyBehaviourFilter.disableBehaviour(ContentModel.ASPECT_AUDITABLE);
+            policyBehaviourFilter.disableBehaviour(ContentModel.ASPECT_VERSIONABLE);
+            try
+            {                    
+                if(logger.isDebugEnabled())
+                {
+                    logger.debug("set flag nodeRef:" + nodeRef + ",flag:" + flagToQname.get(flag) + ", value:" + value);
+                }
+                nodeService.setProperty(nodeRef, flagToQname.get(flag), value);
+                messageCache.remove(nodeRef);
+            }
+            finally
+            {
+                policyBehaviourFilter.enableBehaviour(ContentModel.ASPECT_AUDITABLE);
+                policyBehaviourFilter.enableBehaviour(ContentModel.ASPECT_VERSIONABLE);                
             }
-            nodeService.setProperty(nodeRef, flagToQname.get(flag), value);
-            messageCache.remove(nodeRef);
         }
     }
 
@@ -1429,14 +1435,16 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol
             {    
                 try
                 {
-                    policyBehaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_AUDITABLE);
+                    policyBehaviourFilter.disableBehaviour(ContentModel.ASPECT_AUDITABLE);
+                    policyBehaviourFilter.disableBehaviour(ContentModel.ASPECT_VERSIONABLE);
                     logger.debug("[checkForFlaggableAspect] Adding flaggable aspect to nodeRef: " + nodeRef);
                     Map<QName, Serializable> aspectProperties = new HashMap<QName, Serializable>();
                     nodeService.addAspect(nodeRef, ImapModel.ASPECT_FLAGGABLE, aspectProperties);
                 }
                 finally
                 {
-                    policyBehaviourFilter.enableBehaviour(nodeRef, ContentModel.ASPECT_AUDITABLE);
+                    policyBehaviourFilter.enableBehaviour(ContentModel.ASPECT_AUDITABLE);
+                    policyBehaviourFilter.enableBehaviour(ContentModel.ASPECT_VERSIONABLE);
                 }
             }
         }
diff --git a/source/java/org/alfresco/repo/jscript/ScriptNode.java b/source/java/org/alfresco/repo/jscript/ScriptNode.java
index f35615d0d1..b41b2d8b4b 100644
--- a/source/java/org/alfresco/repo/jscript/ScriptNode.java
+++ b/source/java/org/alfresco/repo/jscript/ScriptNode.java
@@ -471,9 +471,6 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
      * childByNamePath returns the Node at the specified 'cm:name' based Path walking the children of this Node.
      *         So a valid call might be:
      *         <code>mynode.childByNamePath("/QA/Testing/Docs");</code>
-     *         
-     *         is a leading / required? No, but it can be specified.
-     *         are wild-cards supported? Does not seem to be used anywhere
      * 
      * @return The ScriptNode or null if the node is not found.
      */
@@ -483,10 +480,8 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
         
         if (this.services.getDictionaryService().isSubClass(getQNameType(), ContentModel.TYPE_FOLDER))
         {
-            /**
-             * The current node is a folder.
-             * optimized code path for cm:folder and sub-types supporting getChildrenByName() method
-             */ 
+            // The current node is a folder e.g. Company Home and standard child folders.
+            // optimized code path for cm:folder and sub-types supporting getChildrenByName() method
             NodeRef result = null;
             StringTokenizer t = new StringTokenizer(path, "/");
             if (t.hasMoreTokens())
@@ -510,10 +505,8 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
         }
         else
         {
-            /**
-             * The current node is not a folder.   Perhaps it is Company Home ?
-             */
-            // convert the name based path to a valid XPath query
+            // The current node is not a folder. It does not support the cm:contains association.
+            // Convert the name based path to a valid XPath query
             StringBuilder xpath = new StringBuilder(path.length() << 1);
             StringTokenizer t = new StringTokenizer(path, "/");
             int count = 0;
diff --git a/source/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java b/source/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java
index ff2fbf2911..9c50dd6029 100644
--- a/source/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java
+++ b/source/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java
@@ -27,21 +27,24 @@ import org.alfresco.repo.security.authentication.AuthenticationException;
 import org.alfresco.service.cmr.remoteconnector.RemoteConnectorRequest;
 import org.alfresco.service.cmr.remoteconnector.RemoteConnectorResponse;
 import org.alfresco.service.cmr.remoteconnector.RemoteConnectorService;
+import org.alfresco.util.HttpClientHelper;
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.apache.commons.httpclient.methods.EntityEnclosingMethod;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.simple.JSONObject;
-import org.json.simple.parser.ParseException;
 import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
 import org.springframework.extensions.webscripts.Status;
 
 /**
  * HttpClient powered implementation of {@link RemoteConnectorService}, which 
- *  performs requests to remote HTTP servers
+ *  performs requests to remote HTTP servers.
+ *  
+ * Note - this class assumes direct connectivity is available to the destination
+ *  system, and does not support proxies.
  *  
  * @author Nick Burch
  * @since 4.0.2
@@ -54,13 +57,8 @@ public class RemoteConnectorServiceImpl implements RemoteConnectorService
     private static Log logger = LogFactory.getLog(RemoteConnectorServiceImpl.class);
     private static final long MAX_BUFFER_RESPONSE_SIZE = 10*1024*1024;
             
-    private HttpClient httpClient;
-    
     public RemoteConnectorServiceImpl()
-    {
-        httpClient = new HttpClient();
-        httpClient.setHttpConnectionManager(new MultiThreadedHttpConnectionManager());
-    }
+    {}
     
     /**
      * Builds a new Request object
@@ -105,38 +103,59 @@ public class RemoteConnectorServiceImpl implements RemoteConnectorService
         if (logger.isDebugEnabled())
             logger.debug("Performing " + request.getMethod() + " request to " + request.getURL());
         
-        // Perform the request
-        int status = httpClient.executeMethod(httpRequest);
-        String statusText = httpRequest.getStatusText();
+        // Grab our thread local HttpClient instance
+        // Remember - we must then clean it up!
+        HttpClient httpClient = HttpClientHelper.getHttpClient();
         
-        Header[] responseHdrs = httpRequest.getResponseHeaders();
-        Header responseContentTypeH = httpRequest.getResponseHeader(RemoteConnectorRequestImpl.HEADER_CONTENT_TYPE);
-        String responseCharSet = httpRequest.getResponseCharSet();
-        String responseContentType = (responseContentTypeH != null ? responseContentTypeH.getValue() : null);
-        
-        
-        // Decide on how best to handle the response, based on the size
-        // Ideally, we want to close the HttpClient resources immediately, but
-        //  that isn't possible for very large responses
+        // Perform the request, and wrap the response
+        int status = -1;
+        String statusText = null;
         RemoteConnectorResponse response = null;
-        if (httpRequest.getResponseContentLength() > MAX_BUFFER_RESPONSE_SIZE)
+        try
         {
-            // Need to wrap the InputStream in something that'll close
-            InputStream wrappedStream = new HttpClientReleasingInputStream(httpRequest);
+            status = httpClient.executeMethod(httpRequest);
+            statusText = httpRequest.getStatusText();
             
-            // Now build the response
-            response = new RemoteConnectorResponseImpl(request, responseContentType, responseCharSet,
-                                                       responseHdrs, wrappedStream);
+            Header[] responseHdrs = httpRequest.getResponseHeaders();
+            Header responseContentTypeH = httpRequest.getResponseHeader(RemoteConnectorRequestImpl.HEADER_CONTENT_TYPE);
+            String responseCharSet = httpRequest.getResponseCharSet();
+            String responseContentType = (responseContentTypeH != null ? responseContentTypeH.getValue() : null);
+            
+            
+            // Decide on how best to handle the response, based on the size
+            // Ideally, we want to close the HttpClient resources immediately, but
+            //  that isn't possible for very large responses
+            // If we can close immediately, it makes cleanup simpler and fool-proof
+            if (httpRequest.getResponseContentLength() > MAX_BUFFER_RESPONSE_SIZE)
+            {
+                // Need to wrap the InputStream in something that'll close
+                InputStream wrappedStream = new HttpClientReleasingInputStream(httpRequest);
+                httpRequest = null;
+                
+                // Now build the response
+                response = new RemoteConnectorResponseImpl(request, responseContentType, responseCharSet,
+                                                           responseHdrs, wrappedStream);
+            }
+            else
+            {
+                // Fairly small response, just keep the bytes and make life simple
+                response = new RemoteConnectorResponseImpl(request, responseContentType, responseCharSet,
+                                                           responseHdrs, httpRequest.getResponseBody());
+                
+                // Now we have the bytes, we can close the HttpClient resources
+                httpRequest.releaseConnection();
+                httpRequest = null;
+            }
         }
-        else
+        finally
         {
-            // Fairly small response, just keep the bytes and make life simple
-            response = new RemoteConnectorResponseImpl(request, responseContentType, responseCharSet,
-                                                       responseHdrs, httpRequest.getResponseBody());
-            
-            // Now we have the bytes, we can close the HttpClient resources
-            httpRequest.releaseConnection();
-            httpRequest = null;
+            // Make sure, problems or not, we always tidy up (if not large stream based)
+            // This is important because we use a thread local HttpClient instance
+            if (httpRequest != null)
+            {
+                httpRequest.releaseConnection();
+                httpRequest = null;
+            }
         }
         
         
@@ -225,5 +244,25 @@ public class RemoteConnectorServiceImpl implements RemoteConnectorService
                 httpRequest = null;
             }
         }
+
+        /**
+         * In case the caller has neglected to close the Stream, warn
+         *  (as this will break things for other users!) and then close 
+         */
+        @Override
+        protected void finalize() throws Throwable
+        {
+            if (httpRequest != null)
+            {
+                logger.warn("RemoteConnector response InputStream wasn't closed but must be! This can cause issues for " +
+                		    "other requests in this Thread!");
+                
+                httpRequest.releaseConnection();
+                httpRequest = null;
+            }
+         
+            // Let the InputStream tidy up if it wants to too
+            super.finalize();
+        }
     }
 }
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java b/source/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java
index 74ad5bd4ef..732d820519 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java
@@ -2304,13 +2304,18 @@ public class IndexInfo implements IndexMonitor
 
     private void registerReferenceCountingIndexReader(String id, IndexReader reader) throws IOException
     {
-        clearInvalid(Collections.singleton(id));
         ReferenceCounting referenceCounting = (ReferenceCounting) reader;
         if (!referenceCounting.getId().equals(id))
         {
             throw new IllegalStateException("Registering " + referenceCounting.getId() + " as " + id);
         }
-        referenceCountingReadOnlyIndexReaders.put(id, reader);
+        // ALF-13981: Be careful not to invalidate the segment reader if we are trying to re-register exactly the same
+        // one (e.g. in a doWithFileLock() retry loop)
+        if (referenceCountingReadOnlyIndexReaders.get(id) != reader)
+        {
+            clearInvalid(Collections.singleton(id));
+            referenceCountingReadOnlyIndexReaders.put(id, reader);
+        }
     }
 
     private double getSizeInMb(File file)
diff --git a/source/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java b/source/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java
index f910d4a5e8..e5c9d782c1 100644
--- a/source/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java
+++ b/source/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java
@@ -99,7 +99,7 @@ public abstract class WorkflowNotificationUtils
         notificationContext.setSubject(subject);
         
         // Set the email template
-        notificationContext.setBodyTemplate(WF_ASSIGNED_TEMPLATE);    
+        notificationContext.setBodyTemplate(services.getFileFolderService().getLocalizedSibling(WF_ASSIGNED_TEMPLATE));   
         
         // Build the template args
         Map<String, Serializable>templateArgs = new HashMap<String, Serializable>(7);
diff --git a/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java b/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java
index 23dce70231..553f804988 100644
--- a/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java
+++ b/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java
@@ -2689,10 +2689,7 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
                     Map<String, Object> tokenVars = varMap.getVariablesLocally();
                     for (Map.Entry<String, Object> entry : tokenVars.entrySet())
                     {
-                        if (!vars.containsKey(entry.getKey()))
-                        {
-                            vars.put(entry.getKey(), entry.getValue());
-                        }
+                        vars.put(entry.getKey(), entry.getValue());
                     }
                 }
                 token = token.getParent();
diff --git a/source/java/org/alfresco/util/HttpClientHelper.java b/source/java/org/alfresco/util/HttpClientHelper.java
new file mode 100644
index 0000000000..34b7709131
--- /dev/null
+++ b/source/java/org/alfresco/util/HttpClientHelper.java
@@ -0,0 +1,316 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.util;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpVersion;
+import org.apache.commons.httpclient.SimpleHttpConnectionManager;
+import org.apache.commons.httpclient.cookie.CookiePolicy;
+import org.apache.commons.httpclient.params.DefaultHttpParamsFactory;
+import org.apache.commons.httpclient.params.HttpClientParams;
+import org.apache.commons.httpclient.params.HttpMethodParams;
+import org.apache.commons.httpclient.params.HttpParams;
+import org.apache.commons.httpclient.util.DateUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.extensions.webscripts.connector.RemoteClient;
+
+/**
+ * Helper class to provide access to Thread Local instances of HttpClient.
+ * These instances will have been set up in a way that optimises the
+ *  performance for one thread doing a fetch and then using the result.
+ * You must call releaseConnection() when you're done with the request,
+ *  otherwise things will break for the next request in this thread!
+ * 
+ * TODO Merge me back to Spring Surf, which is where this code has been
+ *  pulled out from (was in {@link RemoteClient} but not available externally)
+ */
+public class HttpClientHelper
+{   
+    private static Log logger = LogFactory.getLog(HttpClientHelper.class);
+            
+    // HTTP Client instance - per thread
+    private static ThreadLocal<HttpClient> httpClient = new ThreadLocal<HttpClient>()
+    {
+        @Override
+        protected HttpClient initialValue()
+        {
+            logger.debug("Creating HttpClient instance for thread: " + Thread.currentThread().getName());
+            return new HttpClient(new NonBlockingHttpParams());
+        }
+    };
+    
+    /**
+     * Returns an initialised HttpClient instance for the current thread, which
+     *  will have been configured for optimal settings
+     */
+    public static HttpClient getHttpClient()
+    {
+        return httpClient.get();
+    }
+    
+    
+    /////////////////////////////////////////////////////////////////
+    // Helper classes 
+    
+    /**
+     * An extension of the DefaultHttpParamsFactory that uses a RRW lock pattern rather than
+     * full synchronization around the parameter CRUD - to avoid locking on many reads. 
+     * 
+     * @author Kevin Roast
+     */
+    public static class NonBlockingHttpParamsFactory extends DefaultHttpParamsFactory
+    {
+        private volatile HttpParams httpParams;
+        
+        /* (non-Javadoc)
+         * @see org.apache.commons.httpclient.params.DefaultHttpParamsFactory#getDefaultParams()
+         */
+        @Override
+        public HttpParams getDefaultParams()
+        {
+            if (httpParams == null)
+            {
+                synchronized (this)
+                {
+                    if (httpParams == null)
+                    {
+                        httpParams = createParams();
+                    }
+                }
+            }
+            
+            return httpParams;
+        }
+        
+        /**
+         * NOTE: This is a copy of the code in {@link DefaultHttpParamsFactory}
+         *       Unfortunately this is required because although the factory pattern allows the 
+         *       override of the default param creation, it does not allow the class of the actual
+         *       HttpParam implementation to be changed.
+         */
+        @Override
+        protected HttpParams createParams()
+        {
+            HttpClientParams params = new NonBlockingHttpParams(null);
+            
+            params.setParameter(HttpMethodParams.USER_AGENT, "Spring Surf via Apache HttpClient/3.1");
+            params.setVersion(HttpVersion.HTTP_1_1);
+            params.setConnectionManagerClass(SimpleHttpConnectionManager.class);
+            params.setCookiePolicy(CookiePolicy.IGNORE_COOKIES);
+            params.setHttpElementCharset("US-ASCII");
+            params.setContentCharset("ISO-8859-1");
+            params.setParameter(HttpMethodParams.RETRY_HANDLER, new DefaultHttpMethodRetryHandler());
+            
+            List<String> datePatterns = Arrays.asList(
+                    new String[] {
+                            DateUtil.PATTERN_RFC1123,
+                            DateUtil.PATTERN_RFC1036,
+                            DateUtil.PATTERN_ASCTIME,
+                            "EEE, dd-MMM-yyyy HH:mm:ss z",
+                            "EEE, dd-MMM-yyyy HH-mm-ss z",
+                            "EEE, dd MMM yy HH:mm:ss z",
+                            "EEE dd-MMM-yyyy HH:mm:ss z",
+                            "EEE dd MMM yyyy HH:mm:ss z",
+                            "EEE dd-MMM-yyyy HH-mm-ss z",
+                            "EEE dd-MMM-yy HH:mm:ss z",
+                            "EEE dd MMM yy HH:mm:ss z",
+                            "EEE,dd-MMM-yy HH:mm:ss z",
+                            "EEE,dd-MMM-yyyy HH:mm:ss z",
+                            "EEE, dd-MM-yyyy HH:mm:ss z",                
+                    }
+            );
+            params.setParameter(HttpMethodParams.DATE_PATTERNS, datePatterns);
+            
+            String agent = null;
+            try
+            {
+                agent = System.getProperty("httpclient.useragent");
+            }
+            catch (SecurityException ignore)
+            {
+            }
+            if (agent != null)
+            {
+                params.setParameter(HttpMethodParams.USER_AGENT, agent);
+            }
+            
+            String preemptiveDefault = null;
+            try
+            {
+                preemptiveDefault = System.getProperty("httpclient.authentication.preemptive");
+            }
+            catch (SecurityException ignore)
+            {
+            }
+            if (preemptiveDefault != null)
+            {
+                preemptiveDefault = preemptiveDefault.trim().toLowerCase();
+                if (preemptiveDefault.equals("true"))
+                {
+                    params.setParameter(HttpClientParams.PREEMPTIVE_AUTHENTICATION, Boolean.TRUE);
+                }
+                else if (preemptiveDefault.equals("false"))
+                {
+                    params.setParameter(HttpClientParams.PREEMPTIVE_AUTHENTICATION, Boolean.FALSE);
+                }
+            }
+            
+            String defaultCookiePolicy = null;
+            try
+            {
+                defaultCookiePolicy = System.getProperty("apache.commons.httpclient.cookiespec");
+            }
+            catch (SecurityException ignore)
+            {
+            }
+            if (defaultCookiePolicy != null)
+            {
+                if ("COMPATIBILITY".equalsIgnoreCase(defaultCookiePolicy))
+                {
+                    params.setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY);
+                }
+                else if ("NETSCAPE_DRAFT".equalsIgnoreCase(defaultCookiePolicy))
+                {
+                    params.setCookiePolicy(CookiePolicy.NETSCAPE);
+                }
+                else if ("RFC2109".equalsIgnoreCase(defaultCookiePolicy))
+                {
+                    params.setCookiePolicy(CookiePolicy.RFC_2109);
+                }
+            }
+            
+            return params;
+        }
+    }
+    
+    /**
+     * @author Kevin Roast
+     */
+    public static class NonBlockingHttpParams extends HttpClientParams
+    {
+        private HashMap<String, Object> parameters = new HashMap<String, Object>(8);
+        private ReadWriteLock paramLock = new ReentrantReadWriteLock();
+        
+        public NonBlockingHttpParams()
+        {
+            super();
+        }
+        
+        public NonBlockingHttpParams(HttpParams defaults)
+        {
+            super(defaults);
+        }
+        
+        @Override
+        public Object getParameter(final String name)
+        {
+            // See if the parameter has been explicitly defined
+            Object param = null;
+            paramLock.readLock().lock();
+            try
+            {
+                param = this.parameters.get(name);
+            }
+            finally
+            {
+                paramLock.readLock().unlock();
+            }
+            if (param == null)
+            {
+                // If not, see if defaults are available
+                HttpParams defaults = getDefaults();
+                if (defaults != null)
+                {
+                    // Return default parameter value
+                    param = defaults.getParameter(name);
+                }
+            }
+            return param;
+        }
+        
+        @Override
+        public void setParameter(final String name, final Object value)
+        {
+            paramLock.writeLock().lock();
+            try
+            {
+                this.parameters.put(name, value);
+            }
+            finally
+            {
+                paramLock.writeLock().unlock();
+            }
+        }
+        
+        @Override
+        public boolean isParameterSetLocally(final String name)
+        {
+            paramLock.readLock().lock();
+            try
+            {
+                return (this.parameters.get(name) != null);
+            }
+            finally
+            {
+                paramLock.readLock().unlock();
+            }
+        }
+        
+        @Override
+        public void clear()
+        {
+            paramLock.writeLock().lock();
+            try
+            {
+                this.parameters.clear();
+            }
+            finally
+            {
+                paramLock.writeLock().unlock();
+            }
+        }
+        
+        @Override
+        public Object clone() throws CloneNotSupportedException
+        {
+            NonBlockingHttpParams clone = (NonBlockingHttpParams)super.clone();
+            paramLock.readLock().lock();
+            try
+            {
+                clone.parameters = (HashMap) this.parameters.clone();
+            }
+            finally
+            {
+                paramLock.readLock().unlock();
+            }
+            clone.setDefaults(getDefaults());
+            return clone;
+        }
+    }
+}
diff --git a/source/java/org/alfresco/util/OpenOfficeCommandLine.java b/source/java/org/alfresco/util/OpenOfficeCommandLine.java
new file mode 100644
index 0000000000..ae41d230b8
--- /dev/null
+++ b/source/java/org/alfresco/util/OpenOfficeCommandLine.java
@@ -0,0 +1,191 @@
+/* Copyright (C) 2005-2012 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.util.OpenOfficeURI;
+import org.alfresco.util.exec.RuntimeExec;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A map giving the open office start up command, which depends on the version of
+ * OpenOffice or LibreOffice.
+ * 
+ * @author Alan Davis
+ */
+public class OpenOfficeCommandLine extends AbstractMap<String, List<String>>
+{
+    private static final String[] EXTENSIONS = new String[] {"", ".exe", ".com", ".bat", ".cmd"};
+
+    private static final Log logger = LogFactory.getLog(OpenOfficeCommandLine.class);
+
+    private static final String OS_NAME = System.getProperty("os.name").toLowerCase();
+
+    private Map<String, List<String>> map = new HashMap<String, List<String>>();
+    
+    private boolean windows;
+    
+    public OpenOfficeCommandLine(String exe, String port, String user) throws IOException
+    {
+        windows = isWindows();
+        File executable = findExecutable(exe);
+        File officeHome = getOfficeHome(executable);
+
+        List<String> command = new ArrayList<String>();
+        String acceptValue = "socket,host=127.0.0.1,port="+port+";urp;StarOffice.ServiceManager";
+        String userInstallation = new OpenOfficeURI(user).toString();
+        command.add(executable == null ? exe : executable.getAbsolutePath());
+        if (isLibreOffice3Dot5(officeHome))
+        {
+            command.add("--accept=" + acceptValue);
+            command.add("-env:UserInstallation=" + userInstallation);
+            command.add("--headless");
+            command.add("--nocrashreport");
+            //command.add("--nodefault"); included by JOD
+            command.add("--nofirststartwizard");
+            //command.add("--nolockcheck"); included by JOD
+            command.add("--nologo");
+            command.add("--norestore");
+            logger.info("Using GNU based LibreOffice command: "+command);
+        }
+        else
+        {
+            command.add("-accept=" + acceptValue);
+            command.add("-env:UserInstallation=" + userInstallation);
+            command.add("-headless");
+            command.add("-nocrashreport");
+            //command.add("-nodefault"); included by JOD
+            command.add("-nofirststartwizard");
+            //command.add("-nolockcheck");  included by JOD
+            command.add("-nologo");
+            command.add("-norestore");
+            logger.info("Using original OpenOffice command: "+command);
+        }
+        map.put(RuntimeExec.KEY_OS_DEFAULT, command);
+    }
+    
+    private File getOfficeHome(File executable)
+    {
+        // Get the grandparent
+        File officeHome = executable;
+        for (int i=1; officeHome != null && i <= 2; i++)
+        {
+            officeHome = officeHome.getParentFile();
+        }
+        
+        if (officeHome == null && executable != null)
+        {
+            throw new AlfrescoRuntimeException("Did not find OppenOffice home from executable "+executable.getAbsolutePath());
+        }
+
+        return officeHome;
+    }
+    
+    private File findExecutable(String executableName)
+    {
+        File file = new File(executableName);
+        if (file.isAbsolute())
+        {
+            file = canExecute(file);
+        }
+        else
+        {
+            file = findExecutableOnPath(executableName);
+        }
+        return file;
+    }
+
+    private File findExecutableOnPath(String executableName)  
+    {  
+        String systemPath = System.getenv("PATH");  
+        systemPath = systemPath == null ? System.getenv("path") : systemPath;
+        String[] pathDirs = systemPath.split(File.pathSeparator);  
+   
+        File fullyQualifiedExecutable = null;  
+        for (String pathDir : pathDirs)  
+        {
+            File file = canExecute(new File(pathDir, executableName));
+            if (file != null)
+            {
+                fullyQualifiedExecutable = file;
+                break;
+            }
+        }  
+        return fullyQualifiedExecutable;  
+    } 
+    
+    private File canExecute(File file)
+    {
+        File fullyQualifiedExecutable = null;
+        File dir = file.getParentFile();
+        String name = file.getName();
+        for (String ext: EXTENSIONS)
+        {
+            file = new File(dir, name+ext);
+            if (file.canExecute())  
+            {
+                fullyQualifiedExecutable = file;  
+                break;
+            }
+            if (!windows)
+            {
+                break;
+            }
+        }
+        return fullyQualifiedExecutable;
+    }
+
+    private boolean isLibreOffice3Dot5(File officeHome)
+    {
+        return
+            officeHome != null &&
+            !new File(officeHome, "basis-link").isFile() &&
+             new File(officeHome, "ure-link").isFile();
+    }
+
+    private static boolean isLinux()
+    {
+        return OS_NAME.startsWith("linux");
+    }
+
+    private static boolean isMac()
+    {
+        return OS_NAME.startsWith("mac");
+    }
+
+    private static boolean isWindows()
+    {
+        return OS_NAME.startsWith("windows");
+    }
+
+    @Override
+    public Set<java.util.Map.Entry<String, List<String>>> entrySet()
+    {
+        return map.entrySet();
+    }
+}
