diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index dc35b8a092..fc21cab5bc 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -194,7 +194,10 @@
                               <echo>Recreating database...</echo>
                               <sql driver="org.postgresql.Driver" url="jdbc:postgresql:template1" userid="alfresco" password="alfresco" autocommit="true">drop database if exists alfresco; create database alfresco</sql>
                               <echo>Downloading Alfresco installer...</echo>
-                              <get src="https://releases.alfresco.com/${installer.path}" dest="target/alf-installer.bin" />
+
+                              <sshexec username="tomcat" host="pbam01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="installerPath" command="ls -rt ${installer.path} | tail -1 | tr ' ' '?' " />
+                              <scp remoteFile="tomcat@pbam01.alfresco.com:${installerPath}" localTofile="target/alf-installer.bin" keyfile="${user.home}/.ssh/id_rsa" />
+
                               <chmod file="target/alf-installer.bin" perm="a+x" verbose="true" />
                               <echo>Installing Alfresco...</echo>
                               <exec executable="${basedir}/target/alf-installer.bin" dir="target" failonerror="true">
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java
index 4cc11842a7..ec77698540 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java
@@ -42,7 +42,7 @@ import org.alfresco.service.namespace.QName;
 @AlfrescoPublicApi
 public final class RecordsManagementAuditQueryParameters
 {
-    private int maxEntries = -1;
+    private int maxEntries = Integer.MAX_VALUE;
     private String user;
     private NodeRef nodeRef;
     private Date dateFrom;
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java
index 4a7ad4b735..37b8d46324 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java
@@ -92,8 +92,8 @@ public class NotifyOfRecordsDueForReviewJobExecuter extends RecordsManagementJob
                 // notification has not been sent.
                 StringBuilder queryBuffer = new StringBuilder();
                 queryBuffer.append("+ASPECT:\"rma:vitalRecord\" ");
-                queryBuffer.append("+(@rma\\:reviewAsOf:[MIN TO NOW] ) ");
-                queryBuffer.append("+( ");
+                queryBuffer.append("AND @rma\\:reviewAsOf:[MIN TO NOW] ");
+                queryBuffer.append("AND ( ");
                 queryBuffer.append("@rma\\:notificationIssued:false ");
                 queryBuffer.append("OR ISNULL:\"rma:notificationIssued\" ");
                 queryBuffer.append(") ");
diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java
index 50511302a7..4c9f507c19 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java
@@ -171,9 +171,9 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
         // "audit.start", "audit.view" and "Update RM Object";
         entries = getAuditTrail(3, ADMIN_USER);
 
-        assertEquals(entries.get(0).getEvent(), "audit.start");
+        assertEquals(entries.get(2).getEvent(), "audit.start");
         assertEquals(entries.get(1).getEvent(), "audit.view");
-        assertEquals(entries.get(2).getEvent(), "Update RM Object");
+        assertEquals(entries.get(0).getEvent(), "Update RM Object");
 
         // New "audit.view" event was generated - will be visible on next getAuditTrail().
 
@@ -185,14 +185,14 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
                 nodeService.deleteNode(record);
                 List<RecordsManagementAuditEntry> entries = getAuditTrail(5, ADMIN_USER);
 
-                assertEquals(entries.get(0).getEvent(), "audit.start");
-                assertEquals(entries.get(1).getEvent(), "audit.view");
-                assertEquals(entries.get(2).getEvent(), "Update RM Object");
+                assertEquals(entries.get(4).getEvent(), "audit.start");
                 assertEquals(entries.get(3).getEvent(), "audit.view");
+                assertEquals(entries.get(2).getEvent(), "Update RM Object");
+                assertEquals(entries.get(1).getEvent(), "audit.view");
 
                 // Show the audit contains a reference to the deleted item:
-                assertEquals(entries.get(4).getEvent(), "Delete RM Object");
-                assertEquals(entries.get(4).getNodeRef(), record);
+                assertEquals(entries.get(0).getEvent(), "Delete RM Object");
+                assertEquals(entries.get(0).getNodeRef(), record);
 
                 return null;
             }
@@ -212,7 +212,7 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
 
         // show the audit has been updated
         List<RecordsManagementAuditEntry> entries = getAuditTrail(3, ADMIN_USER);
-        final RecordsManagementAuditEntry entry = entries.get(2);
+        final RecordsManagementAuditEntry entry = entries.get(0);
         assertNotNull(entry);
 
         // investigate the contents of the audit entry