diff --git a/config/alfresco/bootstrap/spaces.xml b/config/alfresco/bootstrap/spaces.xml
index 67aec4fba4..4d6954387b 100644
--- a/config/alfresco/bootstrap/spaces.xml
+++ b/config/alfresco/bootstrap/spaces.xml
@@ -141,6 +141,13 @@
${spaces.imap_attachments.name}
${spaces.imap_attachments.description}
+
+
+ ${spaces.imap_home.name}
+ space-icon-default
+ ${spaces.imap_home.name}
+ ${spaces.imap_home.description}
+
diff --git a/config/alfresco/content-services-context.xml b/config/alfresco/content-services-context.xml
index 40f1d8af08..e75c214c24 100644
--- a/config/alfresco/content-services-context.xml
+++ b/config/alfresco/content-services-context.xml
@@ -634,11 +634,11 @@
+ parent="baseComplexContentTransformer" >
-
+
diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index 693bff23d3..f37b43d455 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -374,6 +374,11 @@
+
+
+ org.alfresco.service.cmr.repository.InvalidNodeRefException
+
+
${server.transaction.max-retries}
@@ -638,6 +643,7 @@
webdav:sharedLockTokens
webdav:lockDepth
webdav:lockScope
+ webdav:deadproperties
cm:likesRatingSchemeTotal
cm:likesRatingSchemeCount
cm:fiveStarRatingSchemeCount
@@ -647,7 +653,7 @@
cm:expiryDate
sys:clientVisibilityMask
-
+
@@ -679,7 +685,7 @@
- alfresco/model/dataTypeAnalyzers
+ ${lucene.defaultAnalyserResourceBundleName}
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml
index 87cadd217b..1a875859ae 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml
@@ -90,9 +90,9 @@
@@ -100,9 +100,9 @@
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 8010c9b931..3a80648bb6 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
@@ -1332,6 +1332,24 @@
alf_transaction
+
+