DS-1582:  Merged update to LdapServiceImpl in from branch DS-1008 that had not yet made it to Master.