diff --git a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.Dialect/AclChangeSet-Tracking2.sql b/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.Dialect/AclChangeSet-Tracking2.sql
index 26b0a87030..5a862266b0 100644
--- a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.Dialect/AclChangeSet-Tracking2.sql
+++ b/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.Dialect/AclChangeSet-Tracking2.sql
@@ -11,7 +11,7 @@
 --FOREACH alf_acl_change_set.id system.upgrade.alf_acl_change_set.batchsize
 UPDATE alf_acl_change_set
    SET
-      commit_time_ms = (select min(t.commit_time_ms) from alf_transaction t) 
+      commit_time_ms = ((select min(t.commit_time_ms) from alf_transaction t) + id)
    WHERE
       id >= ${LOWERBOUND} AND id <= ${UPPERBOUND}
       AND  commit_time_ms < (select min(t.commit_time_ms) from alf_transaction t) 
diff --git a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/AclChangeSet-Tracking.sql b/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/AclChangeSet-Tracking.sql
index 413c5867b1..7da3bc6583 100644
--- a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/AclChangeSet-Tracking.sql
+++ b/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/AclChangeSet-Tracking.sql
@@ -15,7 +15,7 @@ ALTER TABLE alf_acl_change_set
 --FOREACH alf_acl_change_set.id system.upgrade.alf_acl_change_set.batchsize
 UPDATE alf_acl_change_set
    SET
-      commit_time_ms = ${NOW}
+      commit_time_ms = ${NOW} + id
    WHERE
       id >= ${LOWERBOUND} AND id <= ${UPPERBOUND}
 ;
diff --git a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/AclChangeSet-Tracking.sql b/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/AclChangeSet-Tracking.sql
index d4e6b452bc..f55aedb476 100644
--- a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/AclChangeSet-Tracking.sql
+++ b/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/AclChangeSet-Tracking.sql
@@ -17,7 +17,7 @@ ALTER TABLE alf_acl_change_set
 --FOREACH alf_acl_change_set.id system.upgrade.alf_acl_change_set.batchsize
 UPDATE alf_acl_change_set
    SET
-      commit_time_ms = ${NOW}
+      commit_time_ms = ${NOW} + id
    WHERE
       id >= ${LOWERBOUND} AND id <= ${UPPERBOUND}
 ;
diff --git a/source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorClientException.java b/source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorClientException.java
index 355794d931..bb3c46dd72 100644
--- a/source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorClientException.java
+++ b/source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorClientException.java
@@ -18,7 +18,7 @@
  */
 package org.alfresco.service.cmr.remoteconnector;
 
-import java.io.IOException;
+import org.alfresco.error.AlfrescoRuntimeException;
 
 /**
  * An exception thrown when the remote server indicates that the
@@ -32,7 +32,7 @@ import java.io.IOException;
  * @author Nick Burch
  * @since 4.0.3
  */
-public class RemoteConnectorClientException extends IOException
+public class RemoteConnectorClientException extends AlfrescoRuntimeException
 {
     private static final long serialVersionUID = -639209368873463536L;
     private final int statusCode;
diff --git a/source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorServerException.java b/source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorServerException.java
index 673e02e622..7458627e6b 100644
--- a/source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorServerException.java
+++ b/source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorServerException.java
@@ -18,7 +18,7 @@
  */
 package org.alfresco.service.cmr.remoteconnector;
 
-import java.io.IOException;
+import org.alfresco.error.AlfrescoRuntimeException;
 
 /**
  * An exception thrown when the remote server indicates that it
@@ -28,7 +28,7 @@ import java.io.IOException;
  * @author Nick Burch
  * @since 4.0.3
  */
-public class RemoteConnectorServerException extends IOException
+public class RemoteConnectorServerException extends AlfrescoRuntimeException
 {
     private static final long serialVersionUID = -639209368873463536L;
     private final int statusCode;