diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index d74533ba79..10c6ce6e73 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -292,3 +292,6 @@ patch.redeployNominatedInvitationProcessWithPropsForShare.result=Nominated invit
 
 patch.transferDefinitions.description=Add transfer definitions folder to data dictionary.
 patch.transferDefinitions.result=Transfer definitions folder added to data dictionary.
+
+patch.redeployNominatedInvitationProcessWithPropsForShare.description=Redeploy nominated invitation workflow
+patch.redeployNominatedInvitationProcessWithPropsForShare.result=Nominated invitation workflow redeployed
diff --git a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
index 8ff2ed50bd..4374c22c87 100644
--- a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
+++ b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
@@ -488,6 +488,16 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
         return testMode;
     }
 
+    public void setTestMode(boolean testMode)
+    {
+        this.testMode = testMode;
+    }
+
+    public boolean isTestMode()
+    {
+        return testMode;
+    }
+
     public static class URLHelper
     {
         String contextPath;
diff --git a/source/java/org/alfresco/repo/transfer/ChildAssociatedNodeFinder.java b/source/java/org/alfresco/repo/transfer/ChildAssociatedNodeFinder.java
index 44e83f0f80..95db148296 100644
--- a/source/java/org/alfresco/repo/transfer/ChildAssociatedNodeFinder.java
+++ b/source/java/org/alfresco/repo/transfer/ChildAssociatedNodeFinder.java
@@ -41,7 +41,7 @@ import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.transfer.NodeFinder;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.surf.util.ParameterCheck;
 
 /**
  * @author brian
diff --git a/source/java/org/alfresco/repo/transfer/ContentClassFilter.java b/source/java/org/alfresco/repo/transfer/ContentClassFilter.java
index 7493f72b87..6da56009d6 100644
--- a/source/java/org/alfresco/repo/transfer/ContentClassFilter.java
+++ b/source/java/org/alfresco/repo/transfer/ContentClassFilter.java
@@ -37,7 +37,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.transfer.NodeFilter;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.surf.util.ParameterCheck;
 
 /**
  * @author brian
diff --git a/source/java/org/alfresco/repo/transfer/PeerAssociatedNodeFinder.java b/source/java/org/alfresco/repo/transfer/PeerAssociatedNodeFinder.java
index 0fca376e02..b80bb8f3f7 100644
--- a/source/java/org/alfresco/repo/transfer/PeerAssociatedNodeFinder.java
+++ b/source/java/org/alfresco/repo/transfer/PeerAssociatedNodeFinder.java
@@ -41,7 +41,7 @@ import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.transfer.NodeFinder;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
-import org.alfresco.util.ParameterCheck;
+import org.springframework.extensions.surf.util.ParameterCheck;
 
 /**
  * @author brian
diff --git a/source/java/org/alfresco/repo/transfer/RepoTransferReceiverImpl.java b/source/java/org/alfresco/repo/transfer/RepoTransferReceiverImpl.java
index 5b9539c001..8c0a67af88 100644
--- a/source/java/org/alfresco/repo/transfer/RepoTransferReceiverImpl.java
+++ b/source/java/org/alfresco/repo/transfer/RepoTransferReceiverImpl.java
@@ -57,9 +57,9 @@ import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
 import org.alfresco.service.transaction.TransactionService;
-import org.alfresco.util.PropertyCheck;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.PropertyCheck;
 import org.springframework.util.FileCopyUtils;
 
 /**
diff --git a/source/java/org/alfresco/repo/transfer/TransferServiceImpl.java b/source/java/org/alfresco/repo/transfer/TransferServiceImpl.java
index c40c97330a..b317525621 100644
--- a/source/java/org/alfresco/repo/transfer/TransferServiceImpl.java
+++ b/source/java/org/alfresco/repo/transfer/TransferServiceImpl.java
@@ -86,10 +86,10 @@ import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
 import org.alfresco.service.transaction.TransactionService;
-import org.alfresco.util.PropertyCheck;
 import org.alfresco.util.TempFileProvider;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.PropertyCheck;
 import org.xml.sax.SAXException;
 
 
diff --git a/source/java/org/alfresco/repo/transfer/TransferServiceImplTest.java b/source/java/org/alfresco/repo/transfer/TransferServiceImplTest.java
index eaf42f00b6..7afeb89402 100644
--- a/source/java/org/alfresco/repo/transfer/TransferServiceImplTest.java
+++ b/source/java/org/alfresco/repo/transfer/TransferServiceImplTest.java
@@ -54,7 +54,7 @@ import org.alfresco.service.cmr.transfer.TransferTarget;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.BaseAlfrescoSpringTest;
-import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.Pair;
 
 /**
  * Unit test for TransferServiceImpl
diff --git a/source/java/org/alfresco/repo/transfer/UnitTestTransferManifestNodeFactory.java b/source/java/org/alfresco/repo/transfer/UnitTestTransferManifestNodeFactory.java
index a2d86d514c..fef3ab242e 100644
--- a/source/java/org/alfresco/repo/transfer/UnitTestTransferManifestNodeFactory.java
+++ b/source/java/org/alfresco/repo/transfer/UnitTestTransferManifestNodeFactory.java
@@ -38,7 +38,7 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.Path;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.Pair;
 
 /**
  * This is a test class to enable unit testing on a single machine. Since the single machine will already have the
diff --git a/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestReader.java b/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestReader.java
index f4aa46815a..779bc44f6b 100644
--- a/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestReader.java
+++ b/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestReader.java
@@ -36,7 +36,6 @@ import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.alfresco.i18n.I18NUtil;
 import org.alfresco.repo.transfer.PathHelper;
 import org.alfresco.service.cmr.repository.Path;
 
@@ -48,8 +47,9 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.NamespaceException;
 import org.alfresco.service.namespace.NamespacePrefixResolver;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.ISO8601DateFormat;
 import org.alfresco.util.ISO9075;
+import org.springframework.extensions.surf.util.I18NUtil;
+import org.springframework.extensions.surf.util.ISO8601DateFormat;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.Locator;
diff --git a/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestWriter.java b/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestWriter.java
index eefe8d091b..df6c6c026f 100644
--- a/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestWriter.java
+++ b/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestWriter.java
@@ -44,9 +44,9 @@ import org.alfresco.service.cmr.repository.Path;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.ISO8601DateFormat;
 import org.dom4j.io.OutputFormat;
 import org.dom4j.io.XMLWriter;
+import org.springframework.extensions.surf.util.ISO8601DateFormat;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 
diff --git a/source/java/org/alfresco/repo/transfer/report/TransferReporterImpl.java b/source/java/org/alfresco/repo/transfer/report/TransferReporterImpl.java
index c2a63c0497..69c75e4aa9 100644
--- a/source/java/org/alfresco/repo/transfer/report/TransferReporterImpl.java
+++ b/source/java/org/alfresco/repo/transfer/report/TransferReporterImpl.java
@@ -47,8 +47,8 @@ import org.alfresco.service.cmr.transfer.TransferEvent;
 import org.alfresco.service.cmr.transfer.TransferTarget;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.PropertyCheck;
 import org.dom4j.io.XMLWriter;
+import org.springframework.extensions.surf.util.PropertyCheck;
 import org.xml.sax.SAXException;
 
 public class TransferReporterImpl implements TransferReporter
diff --git a/source/java/org/alfresco/repo/transfer/report/XMLTransferReportWriter.java b/source/java/org/alfresco/repo/transfer/report/XMLTransferReportWriter.java
index 838222f56f..73cedb2105 100644
--- a/source/java/org/alfresco/repo/transfer/report/XMLTransferReportWriter.java
+++ b/source/java/org/alfresco/repo/transfer/report/XMLTransferReportWriter.java
@@ -10,9 +10,9 @@ import org.alfresco.repo.transfer.manifest.TransferManifestHeader;
 import org.alfresco.service.cmr.transfer.TransferDefinition;
 import org.alfresco.service.cmr.transfer.TransferEvent;
 import org.alfresco.service.cmr.transfer.TransferTarget;
-import org.alfresco.util.ISO8601DateFormat;
 import org.dom4j.io.OutputFormat;
 import org.dom4j.io.XMLWriter;
+import org.springframework.extensions.surf.util.ISO8601DateFormat;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;