keycloak-uncached

diff --git a/testsuite/integration-arquillian/HOW-TO-RUN.md b/testsuite/integration-arquillian/HOW-TO-RUN.md
index 6b3fb2f..ea7fd50 100644
--- a/testsuite/integration-arquillian/HOW-TO-RUN.md
+++ b/testsuite/integration-arquillian/HOW-TO-RUN.md
@@ -252,10 +252,9 @@ This test will:
 
     mvn -f testsuite/integration-arquillian/pom.xml \
       clean install \
-      -Pauth-server-wildfly,jpa,clean-jpa,auth-server-migration \
+      -Pauth-server-wildfly,jpa,clean-jpa,auth-server-migration,test-70-migration \
       -Dtest=MigrationTest \
       -Dmigration.mode=auto \
-      -Dmigrated.auth.server.version=1.9.8.Final \
       -Djdbc.mvn.groupId=mysql \
       -Djdbc.mvn.version=5.1.29 \
       -Djdbc.mvn.artifactId=mysql-connector-java \
@@ -263,6 +262,11 @@ This test will:
       -Dkeycloak.connectionsJpa.user=keycloak \
       -Dkeycloak.connectionsJpa.password=keycloak
       
+The profile "test-7X-migration" indicates from which version you want to test migration. The valid values are:
+* test-70-migration - indicates migration from RHSSO 7.0 (Equivalent to Keycloak 1.9.8.Final)
+* test-71-migration - indicates migration from RHSSO 7.1 (Equivalent to Keycloak 2.5.5.Final)
+* test-72-migration - indicates migration from RHSSO 7.2 (Equivalent to Keycloak 3.4.3.Final)      
+      
 ### DB migration test with manual mode
       
 Same test as above, but it uses manual migration mode. During startup of the new Keycloak server, Liquibase won't automatically perform DB update, but it 
@@ -274,10 +278,9 @@ just exports the needed SQL into the script. This SQL script then needs to be ma
 
     mvn -f testsuite/integration-arquillian/pom.xml \
       clean install \
-      -Pauth-server-wildfly,jpa,clean-jpa,auth-server-migration \
+      -Pauth-server-wildfly,jpa,clean-jpa,auth-server-migration,test-70-migration \
       -Dtest=MigrationTest \
       -Dmigration.mode=manual \
-      -Dmigrated.auth.server.version=1.9.8.Final \
       -Djdbc.mvn.groupId=mysql \
       -Djdbc.mvn.version=5.1.29 \
       -Djdbc.mvn.artifactId=mysql-connector-java \
@@ -293,10 +296,9 @@ just exports the needed SQL into the script. This SQL script then needs to be ma
  
     mvn -f testsuite/integration-arquillian/tests/base/pom.xml \
       clean install \
-      -Pauth-server-wildfly \
+      -Pauth-server-wildfly,test-70-migration \
       -Dskip.add.user.json=true \
-      -Dmigrated.auth.server.version=1.9.8.Final \
-      -Dtest=MigrationTest   
+      -Dtest=MigrationTest
 
 ### JSON export/import migration test
 This will start latest Keycloak and import the realm JSON file, which was previously exported from Keycloak 1.9.8.Final
@@ -304,10 +306,9 @@ This will start latest Keycloak and import the realm JSON file, which was previo
 
     mvn -f testsuite/integration-arquillian/pom.xml \
       clean install \
-      -Pauth-server-wildfly,migration-import \
+      -Pauth-server-wildfly,migration-import,test-70-migration \
       -Dtest=MigrationTest \
-      -Dmigration.mode=import \
-      -Dmigrated.auth.server.version=1.9.8.Final
+      -Dmigration.mode=import
 
 
 ## Server configuration migration test

diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
index 914edb9..90d4cf8 100644
--- a/testsuite/integration-arquillian/pom.xml
+++ b/testsuite/integration-arquillian/pom.xml
@@ -71,8 +71,9 @@
 
         <!--migration properties-->
         <migration.70.version>1.9.8.Final</migration.70.version>
-        <migration.70.authz.version>2.2.1.Final</migration.70.authz.version>
         <migration.71.version>2.5.5.Final</migration.71.version>
+        <migration.72.version>3.4.3.Final</migration.72.version>
+
         <google.guava.version>23.0</google.guava.version>
         
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -281,9 +282,9 @@
             </build>
         </profile>
         <profile>
-            <id>test-70-authz-migration</id>
+            <id>test-71-migration</id>
             <properties>
-                <migrated.auth.server.version>${migration.70.authz.version}</migrated.auth.server.version>
+                <migrated.auth.server.version>${migration.71.version}</migrated.auth.server.version>
             </properties>
             <build>
                 <pluginManagement>
@@ -301,9 +302,9 @@
             </build>
         </profile>
         <profile>
-            <id>test-71-migration</id>
+            <id>test-72-migration</id>
             <properties>
-                <migrated.auth.server.version>${migration.71.version}</migrated.auth.server.version>
+                <migrated.auth.server.version>${migration.72.version}</migrated.auth.server.version>
             </properties>
             <build>
                 <pluginManagement>

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationTest.java
index 1a35d53..fda367a 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationTest.java
@@ -91,9 +91,4 @@ public class MigrationTest extends AbstractMigrationTest {
         testMigrationTo4_x(false, false);
     }
 
-    @Test
-    @Migration(versionFrom = "2.2.1.Final")
-    public void migrationInAuthorizationServicesTest() {
-        testDroolsToRulesPolicyTypeMigration();
-    }
 }

diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/migration-test/migration-realm-2.5.5.Final.json b/testsuite/integration-arquillian/tests/base/src/test/resources/migration-test/migration-realm-2.5.5.Final.json
index c598bc8..e67ee6a 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/resources/migration-test/migration-realm-2.5.5.Final.json
+++ b/testsuite/integration-arquillian/tests/base/src/test/resources/migration-test/migration-realm-2.5.5.Final.json
@@ -2560,7 +2560,7 @@
     "standardFlowEnabled" : true,
     "implicitFlowEnabled" : false,
     "directAccessGrantsEnabled" : false,
-    "serviceAccountsEnabled" : false,
+    "serviceAccountsEnabled" : true,
     "publicClient" : false,
     "frontchannelLogout" : false,
     "attributes" : { },
@@ -2651,7 +2651,32 @@
     } ],
     "useTemplateConfig" : false,
     "useTemplateScope" : false,
-    "useTemplateMappers" : false
+    "useTemplateMappers" : false,
+    "authorizationServicesEnabled": true,
+    "authorizationSettings": {
+      "resources": [
+        {
+          "name": "group.resource.a",
+          "scopes": ["view-members"]
+        },
+        {
+          "name": "group.resource.b",
+          "scopes": ["view-members"]
+        },
+        {
+          "name": "group.resource.c",
+          "scopes": ["view-members"]
+        },
+        {
+          "name": "group.resource.d",
+          "scopes": ["view-members"]
+        },
+        {
+          "name": "group.resource.e",
+          "scopes": ["view-members"]
+        }
+      ]
+    }
   }, {
     "id" : "401e0c86-afd1-4f4f-8322-32b05222bd06",
     "clientId" : "security-admin-console",

diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/migration-test/migration-realm-3.4.3.Final.json b/testsuite/integration-arquillian/tests/base/src/test/resources/migration-test/migration-realm-3.4.3.Final.json
index fd39026..c104dbb 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/resources/migration-test/migration-realm-3.4.3.Final.json
+++ b/testsuite/integration-arquillian/tests/base/src/test/resources/migration-test/migration-realm-3.4.3.Final.json
@@ -766,7 +766,7 @@
     "standardFlowEnabled" : true,
     "implicitFlowEnabled" : false,
     "directAccessGrantsEnabled" : false,
-    "serviceAccountsEnabled" : false,
+    "serviceAccountsEnabled" : true,
     "publicClient" : false,
     "frontchannelLogout" : false,
     "protocol" : "openid-connect",
@@ -859,7 +859,6 @@
     "useTemplateConfig" : false,
     "useTemplateScope" : false,
     "useTemplateMappers" : false,
-    "serviceAccountsEnabled": true,
     "authorizationServicesEnabled": true,
     "authorizationSettings": {
       "resources": [