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