Merge branch '2.5.x' into KEYCLOAK-4926-2.5.x

testsuite/integration-arquillian/test-apps/js-console/src/main/webapp/index.html

@@ -194,9 +194,6 @@ TimeSkew:
     function sendBearerToKeycloak() {
         var url = 'http://localhost:8180/auth/admin/realms/example/roles';
         if (window.location.href.indexOf("8643") > -1) {
-            url = url.replace("8180","8543");
-            url = url.replace("http","https");
-        if (window.location.href.indexOf("8543") > -1) {
             url = url.replace("8180", "8543");
             url = url.replace("http", "https");
         }

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractDemoServletsAdapterTest.java

@@ -445,6 +445,7 @@ public abstract class AbstractDemoServletsAdapterTest extends AbstractServletsAd
     }
 
     @Test
+    @Ignore
     public void testVersion() {
         Client client = ClientBuilder.newClient();
         WebTarget target = client.target(authServerPage.createUriBuilder()).path("version");