Fixes LDAP System Settings panel and broken LDAP logins.
merge with 2.1M2