CONPLT-7 Improve ldap adapter/mapper

Split apart original change request (#2).  This issue is now changes not in CONPLT-5, 10, 11, 12, 13, 15 and focuses primarily on the ldap adapter changes and includes changes suggested in pull request #2, some email discussions, and changes from latest master.