Some changes to the LDAP store to allow usage without custom attributes.
Merge remote-tracking branch 'upstream/master'