diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java
index 1e8ab62b09..0f6205520b 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java
@@ -407,13 +407,12 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl
                 // if exists and matches we have found our group
                 if (isIPRGroupTrueMatch(group, authorities))
                 {
-                    iprGroup = group;
-                    break;
+                    return new Pair<String, Integer>(group, nextGroupIndex);
                 }
             }
 
             // determine if there are any more pages to inspect
-            hasMoreItems = results.hasMoreItems();
+            hasMoreItems = hasMoreItems ? results.hasMoreItems() : false;
             pageCount ++;
         }
 
@@ -429,8 +428,15 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl
      */
     private boolean isIPRGroupTrueMatch(String group, Set<String> authorities)
     {
+        //Remove GROUP_EVERYONE for proper comparison as GROUP_EVERYONE is never included in an IPR group
+        Set<String> plainAuthorities = new HashSet<String>();
+        if (authorities != null)
+        {
+            plainAuthorities.addAll(authorities);
+            plainAuthorities.remove(PermissionService.ALL_AUTHORITIES);
+        }
         Set<String> contained =  authorityService.getContainedAuthorities(null, group, true);
-        return contained.equals(authorities);
+        return contained.equals(plainAuthorities);
     }
 
     /**
diff --git a/scripts/cleanImages.sh b/scripts/cleanImages.sh
index b0607ba391..8d58cfdc02 100755
--- a/scripts/cleanImages.sh
+++ b/scripts/cleanImages.sh
@@ -10,5 +10,10 @@ if [ "$docker_images_list" == "" ]; then
     echo "No docker images on the agent"
 else
     echo "Clearing images: $docker_images_list"
-    docker rmi -f $docker_images_list
+    if docker rmi -f $docker_images_list ; then
+        echo "Deleting images was successful."
+    else
+        echo "Deleting specified images failed, so falling back to delete ALL images on system."
+        docker rmi -f $(docker images -aq)
+    fi
 fi