LDAP Auth sync

Branch sync with master