diff --git a/distribution/demo-dist/pom.xml b/distribution/demo-dist/pom.xml
index f57344f05a..67f426e7f9 100755
--- a/distribution/demo-dist/pom.xml
+++ b/distribution/demo-dist/pom.xml
@@ -16,7 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-wf9-server-overlay</artifactId>
+            <artifactId>keycloak-server-overlay</artifactId>
             <type>zip</type>
         </dependency>
         <dependency>
@@ -77,7 +77,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.keycloak</groupId>
-                                    <artifactId>keycloak-wf9-server-overlay</artifactId>
+                                    <artifactId>keycloak-server-overlay</artifactId>
                                     <type>zip</type>
                                     <outputDirectory>${project.build.directory}/unpacked/keycloak-server-overlay-${project.version}</outputDirectory>
                                 </artifactItem>
diff --git a/forms/common-themes/src/main/resources/theme/keycloak/login/theme.properties b/forms/common-themes/src/main/resources/theme/keycloak/login/theme.properties
index 63cd61b378..7319690b4b 100644
--- a/forms/common-themes/src/main/resources/theme/keycloak/login/theme.properties
+++ b/forms/common-themes/src/main/resources/theme/keycloak/login/theme.properties
@@ -14,7 +14,7 @@ kcFeedBackClass=col-xs-12 col-sm-4 col-md-5 col-lg-6
 kcFeedBackPlaceholderClass=col-xs-12 col-sm-4 col-md-5 col-lg-6
 kcLocaleClass=col-xs-12 col-sm-1
 
-kcFormAreaClass=col-xs-12 col-sm-8 col-md-8 col-lg-6 login
+kcFormAreaClass=col-xs-12 col-sm-8 col-md-8 col-lg-7 login
 
 kcFormClass=form-horizontal
 kcFormGroupClass=form-group
@@ -27,7 +27,7 @@ kcFormOptionsClass=col-xs-4 col-sm-5 col-md-offset-4 col-md-4 col-lg-offset-3 co
 kcFormButtonsClass=col-xs-8 col-sm-7 col-md-4 col-lg-4 submit
 kcTextareaClass=form-control
 
-kcInfoAreaClass=col-xs-12 col-sm-4 col-md-4 col-lg-6 details
+kcInfoAreaClass=col-xs-12 col-sm-4 col-md-4 col-lg-5 details
 
 ##### css classes for form buttons
 # main class used for all buttons
diff --git a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanRealmCache.java b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanRealmCache.java
index ec93a7a3bb..735e72136e 100755
--- a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanRealmCache.java
+++ b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanRealmCache.java
@@ -110,7 +110,7 @@ public class InfinispanRealmCache implements RealmCache {
     @Override
     public void invalidateRole(CachedRole role) {
         logger.tracev("Removing role {0}", role.getId());
-        cache.remove(role);
+        cache.remove(role.getId());
     }
 
     @Override
diff --git a/pom.xml b/pom.xml
index a1dc852a79..bb9a8203f1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1107,7 +1107,7 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-wf9-server-overlay</artifactId>
+                <artifactId>keycloak-server-overlay</artifactId>
                 <version>${project.version}</version>
                 <type>zip</type>
             </dependency>
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/LDAPEmbeddedServer.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/LDAPEmbeddedServer.java
index 4f89d11976..2fc7028943 100644
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/LDAPEmbeddedServer.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/ldap/LDAPEmbeddedServer.java
@@ -2,6 +2,7 @@ package org.keycloak.testsuite.ldap;
 
 import java.io.File;
 import java.io.InputStream;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -148,7 +149,12 @@ public class LDAPEmbeddedServer {
         }
 
         // For now, assume that LDIF file is on classpath
-        InputStream is = getClass().getClassLoader().getResourceAsStream(ldifFile);
+        InputStream is;
+        if (ldifFile.startsWith("file:")) {
+            is = new URL(ldifFile).openStream();
+        } else {
+            is = getClass().getClassLoader().getResourceAsStream(ldifFile);
+        }
         if (is == null) {
             throw new IllegalStateException("LDIF file not found on classpath. Location was: " + ldifFile);
         }