diff --git a/config/alfresco/messages/patch-service_fr.properties b/config/alfresco/messages/patch-service_fr.properties
index 231ff48423..6754bd86f3 100755
--- a/config/alfresco/messages/patch-service_fr.properties
+++ b/config/alfresco/messages/patch-service_fr.properties
@@ -472,3 +472,14 @@ 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
+
+patch.swsdpPatch.description=Patch to fix up the Sample: Web Site Design Project.
+patch.swsdpPatch.success=Successfully patched the Sample: Web Site Design Project.
+patch.swsdpPatch.skipped=Skipped, not required.
+patch.swsdpPatch.missingSurfConfig=surf-config folder is not present in Sample: Web Site Design Project.
+
+patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both parallel activiti workflows, completion-condition now takes into account if minimum approval percentage can still be achived.
+
+patch.show.audit.success=show_audit.ftl was updated successfully
+
+patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
\ No newline at end of file
diff --git a/config/alfresco/messages/patch-service_it.properties b/config/alfresco/messages/patch-service_it.properties
index b328dd8a15..6754bd86f3 100755
--- a/config/alfresco/messages/patch-service_it.properties
+++ b/config/alfresco/messages/patch-service_it.properties
@@ -476,4 +476,10 @@ patch.syncSetDefinitionsContainer.description=Patch to add the root folder for S
 patch.swsdpPatch.description=Patch to fix up the Sample: Web Site Design Project.
 patch.swsdpPatch.success=Successfully patched the Sample: Web Site Design Project.
 patch.swsdpPatch.skipped=Skipped, not required.
-patch.swsdpPatch.missingSurfConfig=surf-config folder is not present in Sample: Web Site Design Project.
\ No newline at end of file
+patch.swsdpPatch.missingSurfConfig=surf-config folder is not present in Sample: Web Site Design Project.
+
+patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both parallel activiti workflows, completion-condition now takes into account if minimum approval percentage can still be achived.
+
+patch.show.audit.success=show_audit.ftl was updated successfully
+
+patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/query/AbstractQNameAwareCannedQueryFactory.java b/source/java/org/alfresco/repo/query/AbstractQNameAwareCannedQueryFactory.java
index 463ad81d16..e375a1f887 100644
--- a/source/java/org/alfresco/repo/query/AbstractQNameAwareCannedQueryFactory.java
+++ b/source/java/org/alfresco/repo/query/AbstractQNameAwareCannedQueryFactory.java
@@ -140,7 +140,7 @@ public abstract class AbstractQNameAwareCannedQueryFactory<R> extends AbstractCa
             {
                 logger.trace("QName does not exist: " + qname); // possible ... eg. blg:blogPost if a blog has never been posted externally
             }
-            return null;
+            return -1L;
         }
         return qnamePair.getFirst();
     }
diff --git a/source/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceImpl.java b/source/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceImpl.java
index 7b6a8c0a73..836b336e68 100644
--- a/source/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceImpl.java
+++ b/source/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceImpl.java
@@ -326,7 +326,16 @@ public class RemoteAlfrescoTicketServiceImpl implements RemoteAlfrescoTicketServ
         // Turn this into a remote request
         RemoteConnectorRequest request = remoteConnectorService.buildRequest(url, "POST");
         request.setRequestBody(json.toJSONString());
-
+        
+        Map<String,String> reqHeaders = remoteSystemsReqHeaders.get(remoteSystemId);
+        if (reqHeaders != null)
+        {
+            for (Map.Entry<String, String> reqHeader : reqHeaders.entrySet())
+            {
+                request.addRequestHeader(reqHeader.getKey(), reqHeader.getValue());
+            }
+        }
+        
         // Work out what key we'll use to cache on
         String cacheKey = toCacheKey(remoteSystemId, credentials);
         
diff --git a/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java b/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
index 327f7375e8..f80cbcd668 100644
--- a/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
+++ b/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
@@ -709,7 +709,10 @@ public class RepositoryAuthenticationDao implements MutableAuthenticationDao, In
     public void onUpdateUserProperties(NodeRef nodeRef, Map<QName, Serializable> before, Map<QName, Serializable> after)
     {
         String uidBefore = DefaultTypeConverter.INSTANCE.convert(String.class, before.get(ContentModel.PROP_USER_USERNAME));
-        authenticationCache.remove(uidBefore);
+        if (uidBefore != null)
+        {
+            authenticationCache.remove(uidBefore);
+        }
     }
 
     @Override