Removes password requirement for LDAP users.
Merge branch '2.1M2' into qa