r13843: Merge in net sam provision and some pdb_ldap fixes