LDAP: configurable LDAP Object Classes for User
Merge pull request #482 from mposolda/master

LDAP: configurable LDAP Object Classes for User
KEYCLOAK-540 Broken project-integrations/aerogear-ups. Move keycloak-server.json to correct location, so it's used instead of SystemPropertiesConfigProvider
Merge pull request #483 from mposolda/master

KEYCLOAK-540 Broken project-integrations/aerogear-ups. Move keycloak-ser...
Disable cache as it's not working

Conflicts:
	project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/keycloak-server.json
	server/src/main/resources/META-INF/keycloak-server.json
	testsuite/tools/src/main/resources/META-INF/keycloak-server.json
Refactor to prepar for splitting model
Return null for selected provider if empty string