Merge pull request #18111 from grokability/#16914-better-ldap-sync-ph…

Merge pull request #18111 from grokability/#16914-better-ldap-sync-ph… #2525