1e9b563
- resync with development stream, mainly to pull in the fix for #596691 and allow the traditional pam_ldap to be used along with nslcd