BACKLOG-1359: renamed ldap connection, removed 'surfnet'