Merge pull request #2137 from abstractj/KEYCLOAK-2411

Realm import will raise NPE when clientID is missing

services/src/main/java/org/keycloak/services/managers/RealmManager.java

@@ -472,7 +472,7 @@ public class RealmManager implements RealmImporter {
     private boolean hasClient(RealmRepresentation rep, String clientId) {
         if (rep.getClients() != null) {
             for (ClientRepresentation clientRep : rep.getClients()) {
-                if (clientRep.getClientId().equals(clientId)) {
+                if (clientRep.getClientId() != null && clientRep.getClientId().equals(clientId)) {
                     return true;
                 }
             }